summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2018-05-30Merge branch 'bp/merge-rename-config'Libravatar Junio C Hamano8-14/+69
2018-05-30Merge branch 'js/sequencer-and-root-commits'Libravatar Junio C Hamano6-35/+276
2018-05-30Merge branch 'dd/send-email-reedit'Libravatar Junio C Hamano1-7/+31
2018-05-30init: fix grammar in "templates not found" msgLibravatar Robert P. J. Day1-1/+1
2018-05-30sequencer: ensure labels that are object IDs are rewrittenLibravatar brian m. carlson2-1/+18
2018-05-30t990X: use '.git/objects' as 'deep inside .git' pathLibravatar Christian Couder2-2/+2
2018-05-29Sync with Git 2.17.1Libravatar Junio C Hamano28-72/+794
2018-05-29completion: complete general config vars in two stepsLibravatar Nguyễn Thái Ngọc Duy1-2/+7
2018-05-29log-tree: allow to customize 'grafted' colorLibravatar Nguyễn Thái Ngọc Duy2-1/+3
2018-05-29completion: support case-insensitive config varsLibravatar Nguyễn Thái Ngọc Duy1-1/+9
2018-05-29completion: keep other config var completion in camelCaseLibravatar Nguyễn Thái Ngọc Duy1-6/+6
2018-05-29completion: drop the hard coded list of config varsLibravatar Nguyễn Thái Ngọc Duy4-331/+49
2018-05-29am: move advice.amWorkDir parsing back to advice.cLibravatar Nguyễn Thái Ngọc Duy4-6/+5
2018-05-29advice: keep config name in camelCase in advice_config[]Libravatar Nguyễn Thái Ngọc Duy1-21/+21
2018-05-29fsck: produce camelCase config key namesLibravatar Nguyễn Thái Ngọc Duy1-4/+18
2018-05-29help: add --config to list all available configLibravatar Nguyễn Thái Ngọc Duy13-1/+172
2018-05-29fsck: factor out msg_id_info[] lazy initialization codeLibravatar Nguyễn Thái Ngọc Duy1-16/+24
2018-05-29grep: keep all colors in an arrayLibravatar Nguyễn Thái Ngọc Duy2-65/+62
2018-05-29Add and use generic name->id mapping code for color slot parsingLibravatar Nguyễn Thái Ngọc Duy7-112/+82
2018-05-29Merge branch 'nd/command-list' into nd/complete-config-varsLibravatar Junio C Hamano25-313/+589
2018-05-29apply: add --intent-to-addLibravatar Nguyễn Thái Ngọc Duy4-8/+35
2018-05-29t2203: add a test about "diff HEAD" caseLibravatar Nguyễn Thái Ngọc Duy1-0/+17
2018-05-29diff: turn --ita-invisible-in-index on by defaultLibravatar Nguyễn Thái Ngọc Duy3-10/+41
2018-05-29diff: ignore --ita-[in]visible-in-index when diffing worktree-to-treeLibravatar Nguyễn Thái Ngọc Duy2-3/+7
2018-05-29tag: clarify in the doc that a tag can refer to a non-commit objectLibravatar Robert P. J. Day1-2/+2
2018-05-29show-index: update documentation for index v2Libravatar Jeff King1-6/+20
2018-05-29make show-index a builtinLibravatar Jeff King4-2/+5
2018-05-28git-rebase--interactive: fix copy-paste mistakeLibravatar Orgad Shaneh1-1/+1
2018-05-28t6036: prefer test_when_finished to manual cleanup in following testLibravatar Elijah Newren1-10/+12
2018-05-28t6036, t6042: prefer test_cmp to sequences of testLibravatar Elijah Newren2-73/+130
2018-05-28t6036, t6042: prefer test_path_is_file, test_path_is_missingLibravatar Elijah Newren2-22/+22
2018-05-28t6036, t6042: use test_line_count instead of wc -lLibravatar Elijah Newren2-67/+134
2018-05-28t6036, t6042: use test_create_repo to keep tests independentLibravatar Elijah Newren2-815/+926
2018-05-25Use proper syntax for replaceables in command docsLibravatar Robert P. J. Day19-38/+38
2018-05-25submodule: do not pass null OID to setup_revisionsLibravatar Jonathan Tan3-3/+29
2018-05-25rev-parse: check lookup'ed commit references for NULLLibravatar Elijah Newren2-2/+14
2018-05-24Use OPT_SET_INT_F() for cmdline option specificationLibravatar Nguyễn Thái Ngọc Duy11-50/+47
2018-05-24git-p4: add unshelve commandLibravatar Luke Diamand3-36/+347
2018-05-24import-tars: read overlong names from pax extended headerLibravatar Pedro Alvarez Piedehierro1-2/+29
2018-05-23t: make many tests depend less on the refs being filesLibravatar David Turner9-25/+26
2018-05-23The sixth batch for 2.18Libravatar Junio C Hamano1-0/+101
2018-05-23Merge branch 'fg/completion-external'Libravatar Junio C Hamano1-2/+9
2018-05-23Merge branch 'bc/asciidoctor-tab-width'Libravatar Junio C Hamano2-1/+3
2018-05-23Merge branch 'nd/pack-unreachable-objects-doc'Libravatar Junio C Hamano2-0/+15
2018-05-23Merge branch 'nd/completion-aliasfiletype-typofix'Libravatar Junio C Hamano1-1/+1
2018-05-23Merge branch 'em/status-rename-config'Libravatar Junio C Hamano3-5/+13
2018-05-23Merge branch 'cc/perf-bisect'Libravatar Junio C Hamano1-0/+6
2018-05-23Merge branch 'ah/misc-doc-updates'Libravatar Junio C Hamano6-68/+77
2018-05-23Merge branch 'bp/test-drop-caches'Libravatar Junio C Hamano1-12/+4
2018-05-23Merge branch 'en/unpack-trees-split-index-fix'Libravatar Junio C Hamano1-4/+15