summaryrefslogtreecommitdiffstats
path: root/git-merge.sh (unfollow)
Commit message (Expand)AuthorFilesLines
2018-05-22Git 2.13.7v2.13.7Junio C Hamano3-2/+22
2018-05-22verify_path: disallow symlinks in .gitmodulesJeff King4-15/+37
2018-05-22update-index: stat updated files earlierJeff King1-8/+17
2018-05-22verify_dotfile: mention case-insensitivity in commentJeff King1-1/+4
2018-05-22verify_path: drop clever fallthroughJeff King1-4/+4
2018-05-22skip_prefix: add case-insensitive variantJeff King1-0/+17
2018-05-22is_{hfs,ntfs}_dotgitmodules: add testsJohannes Schindelin2-0/+106
2018-05-22is_ntfs_dotgit: match other .git filesJohannes Schindelin2-1/+93
2018-05-22is_hfs_dotgit: match other .git filesJeff King2-12/+51
2018-05-22is_ntfs_dotgit: use a size_t for traversing stringJeff King1-1/+1
2018-05-22submodule-config: verify submodule names as pathsJeff King5-0/+143
2017-10-23Git 2.14.3v2.14.3Junio C Hamano2-1/+25
2017-10-18Prepare for 2.14.3Junio C Hamano2-1/+76
2017-10-17fetch doc: src side of refspec could be full SHA-1Junio C Hamano1-2/+4
2017-10-17tag: respect color.ui configJeff King3-1/+12
2017-10-17Revert "color: check color.ui in git_default_config()"Jeff King8-9/+17
2017-10-17Revert "t6006: drop "always" color config tests"Jeff King1-5/+15
2017-10-17Revert "color: make "always" the same as "auto" in config"Jeff King3-19/+20
2017-10-11checkout doc: clarify command line args for "checkout paths" modeJunio C Hamano1-14/+16
2017-10-07completion: add --broken and --dirty to describeThomas Braun1-1/+1
2017-10-06sha1_loose_object_info: handle errors from unpack_sha1_restJeff King1-2/+6
2017-10-06.mailmap: normalize name for René ScharfeRené Scharfe1-0/+1
2017-10-06fsck: handle NULL return of lookup_blob() and lookup_tree()René Scharfe2-4/+26
2017-10-05ref-filter.c: pass empty-string as NULL to atom parsersTaylor Blau2-1/+10
2017-10-04strbuf doc: reuse after strbuf_release is fineJonathan Nieder1-2/+9
2017-10-04branch: reset instead of release a strbufStefan Beller1-2/+3
2017-10-04sub-process: use child_process.args instead of child_process.argvJohannes Sixt1-2/+1
2017-10-04http-push: fix construction of hex value from pathThomas Gummerer1-1/+1
2017-10-04path.c: fix uninitialized memory accessJeff King1-5/+4
2017-10-04test-stringlist: avoid buffer underrun when sorting nothingRené Scharfe1-1/+1
2017-10-04color: make "always" the same as "auto" in configJeff King3-19/+28
2017-10-04provide --color option for all ref-filter usersJeff King6-4/+16
2017-10-04t3205: use --color instead of color.branch=alwaysJeff King1-3/+2
2017-10-04t3203: drop "always" color testJeff King1-6/+0
2017-10-04t6006: drop "always" color config testsJeff King1-15/+5
2017-10-04t7502: use diff.noprefix for --verbose testJeff King1-2/+2
2017-10-04t7508: use test_terminal for color outputJeff King1-20/+21
2017-10-04t3701: use test-terminal to collect color outputJeff King1-5/+3
2017-10-04t4015: prefer --color to -c color.diff=alwaysJeff King1-14/+14
2017-10-04test-terminal: set TERM=vt100Jeff King7-10/+9
2017-10-03request-pull: capitalise "Git" to make it a proper nounAnn T Ropea2-3/+3
2017-10-03run-command: use ALLOC_ARRAYRené Scharfe1-1/+1
2017-10-02tag: avoid NULL pointer arithmeticRené Scharfe1-4/+4
2017-10-02coccinelle: remove parentheses that become unnecessaryRené Scharfe1-5/+5
2017-09-29fast-import: checkpoint: dump branches/tags/marks even if object_count==0Eric Rannaud2-3/+145
2017-09-29poll.c: always set revents, even if to zeroRandall S. Becker1-0/+4
2017-09-29doc: correct command formattingAdam Dinwoodie1-1/+1
2017-09-27validate_headref: use get_oid_hex for detached HEADsJeff King1-2/+2
2017-09-27validate_headref: use skip_prefix for symref parsingJeff King1-9/+6
2017-09-27validate_headref: NUL-terminate HEAD bufferJeff King1-0/+4