summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* checkout: add advice for ambiguous "checkout <branch>"Ævar Arnfjörð Bjarmason2018-06-115-0/+37
* builtin/checkout.c: use "ret" variable for returnÆvar Arnfjörð Bjarmason2018-06-111-3/+5
* checkout: pass the "num_matches" up to callersÆvar Arnfjörð Bjarmason2018-06-114-7/+15
* checkout.c: change "unique" member to "num_matches"Ævar Arnfjörð Bjarmason2018-06-111-4/+4
* checkout.c: introduce an *_INIT macroÆvar Arnfjörð Bjarmason2018-06-111-1/+3
* checkout.h: wrap the arguments to unique_tracking_name()Ævar Arnfjörð Bjarmason2018-06-111-1/+2
* checkout tests: index should be clean after dwim checkoutÆvar Arnfjörð Bjarmason2018-06-111-0/+29
* A bit more topics before -rc1Junio C Hamano2018-06-011-0/+22
* Merge branch 'bw/ref-prefix-for-configured-refspec'Junio C Hamano2018-06-013-0/+25
|\
| * fetch: do not pass ref-prefixes for fetch by exact SHA1Jonathan Nieder2018-06-013-0/+25
* | Merge branch 'cc/tests-without-assuming-ref-files-backend'Junio C Hamano2018-06-0111-27/+28
|\ \
| * | t990X: use '.git/objects' as 'deep inside .git' pathChristian Couder2018-05-302-2/+2
| * | t: make many tests depend less on the refs being filesDavid Turner2018-05-239-25/+26
* | | Merge branch 'rd/init-typo'Junio C Hamano2018-06-011-1/+1
|\ \ \
| * | | init: fix grammar in "templates not found" msgRobert P. J. Day2018-05-301-1/+1
* | | | Merge branch 'js/rebase-recreate-merge'Junio C Hamano2018-06-013-2/+19
|\ \ \ \
| * | | | sequencer: ensure labels that are object IDs are rewrittenbrian m. carlson2018-05-302-1/+18
| * | | | git-rebase--interactive: fix copy-paste mistakeOrgad Shaneh2018-05-281-1/+1
* | | | | Merge branch 'rd/tag-doc-lightweight'Junio C Hamano2018-06-011-2/+2
|\ \ \ \ \
| * | | | | tag: clarify in the doc that a tag can refer to a non-commit objectRobert P. J. Day2018-05-291-2/+2
| | |_|/ / | |/| | |
* | | | | Merge branch 'rd/doc-options-placeholder'Junio C Hamano2018-06-0119-38/+38
|\ \ \ \ \
| * | | | | Use proper syntax for replaceables in command docsRobert P. J. Day2018-05-2519-38/+38
* | | | | | Merge branch 'en/rev-parse-invalid-range'Junio C Hamano2018-06-012-2/+14
|\ \ \ \ \ \
| * | | | | | rev-parse: check lookup'ed commit references for NULLElijah Newren2018-05-252-2/+14
* | | | | | | Merge branch 'ld/p4-unshelve'Junio C Hamano2018-06-013-36/+347
|\ \ \ \ \ \ \
| * | | | | | | git-p4: add unshelve commandLuke Diamand2018-05-243-36/+347
* | | | | | | | Merge branch 'nd/use-opt-int-set-f'Junio C Hamano2018-06-0111-50/+47
|\ \ \ \ \ \ \ \
| * | | | | | | | Use OPT_SET_INT_F() for cmdline option specificationNguyễn Thái Ngọc Duy2018-05-2411-50/+47
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'pa/import-tars-long-names'Junio C Hamano2018-06-011-2/+29
|\ \ \ \ \ \ \ \
| * | | | | | | | import-tars: read overlong names from pax extended headerPedro Alvarez Piedehierro2018-05-241-2/+29
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'nd/command-list'Junio C Hamano2018-06-0125-313/+589
|\ \ \ \ \ \ \ \
| * | | | | | | | completion: allow to customize the completable command listNguyễn Thái Ngọc Duy2018-05-216-2/+47
| * | | | | | | | completion: add and use --list-cmds=aliasNguyễn Thái Ngọc Duy2018-05-216-81/+40
| * | | | | | | | completion: add and use --list-cmds=nohelpersNguyễn Thái Ngọc Duy2018-05-213-17/+20
| * | | | | | | | Move declaration for alias.c to alias.hNguyễn Thái Ngọc Duy2018-05-2110-5/+17
| * | | | | | | | completion: reduce completable command listNguyễn Thái Ngọc Duy2018-05-211-9/+9
| * | | | | | | | completion: let git provide the completable command listNguyễn Thái Ngọc Duy2018-05-213-119/+58
| * | | | | | | | command-list.txt: documentation and guide lineNguyễn Thái Ngọc Duy2018-05-211-0/+45
| * | | | | | | | help: use command-list.txt for the source of guidesNguyễn Thái Ngọc Duy2018-05-2110-45/+54
| * | | | | | | | help: add "-a --verbose" to list all commands with synopsisNguyễn Thái Ngọc Duy2018-05-215-1/+37
| * | | | | | | | git: support --list-cmds=list-<category>Nguyễn Thái Ngọc Duy2018-05-215-1/+51
| * | | | | | | | completion: implement and use --list-cmds=main,othersNguyễn Thái Ngọc Duy2018-05-215-2/+43
| * | | | | | | | git --list-cmds: collect command list in a string_listNguyễn Thái Ngọc Duy2018-05-211-5/+17
| * | | | | | | | git.c: convert --list-* to --list-cmds=*Nguyễn Thái Ngọc Duy2018-05-214-8/+39
| * | | | | | | | Remove common-cmds.hNguyễn Thái Ngọc Duy2018-05-103-55/+9
| * | | | | | | | help: use command-list.h for common command listNguyễn Thái Ngọc Duy2018-05-105-50/+122
| * | | | | | | | generate-cmds.sh: export all commands to command-list.hNguyễn Thái Ngọc Duy2018-05-104-10/+75
| * | | | | | | | generate-cmds.sh: factor out synopsis extract codeNguyễn Thái Ngọc Duy2018-05-101-7/+11
* | | | | | | | | RelNotes: remove duplicate release noteElijah Newren2018-06-011-11/+3
* | | | | | | | | Git 2.18-rc0v2.18.0-rc0Junio C Hamano2018-05-302-1/+37