summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sg/completion-zsh-workaround'Junio C Hamano2018-06-132-2/+5
|\
| * completion: correct zsh detection when run from git-completion.zshSZEDER Gábor2018-06-122-2/+5
* | Merge branch 'sb/submodule-merge-in-merge-recursive'Junio C Hamano2018-06-131-2/+2
|\ \
| * | merge-submodule: reduce output verbosityLeif Middelschulte2018-06-111-2/+2
* | | Merge branch 'jk/submodule-fsck-loose-fixup'Junio C Hamano2018-06-132-8/+24
|\ \ \
| * | | fsck: avoid looking at NULL blob->objectJeff King2018-06-112-1/+20
| * | | t7415: don't bother creating commit for symlink testJeff King2018-06-111-7/+4
* | | | RelNotes 2.18: clarify where directory rename detection appliesElijah Newren2018-06-131-1/+1
* | | | RelNotes 2.18: typofixesJunio C Hamano2018-06-111-2/+2
* | | | Git 2.18-rc1v2.18.0-rc1Junio C Hamano2018-06-042-1/+13
* | | | Merge branch 'bc/t3430-fixup'Junio C Hamano2018-06-041-3/+2
|\ \ \ \
| * | | | t3430: test clean-upbrian m. carlson2018-06-041-3/+2
* | | | | Merge branch 'bw/refspec-api'Junio C Hamano2018-06-041-0/+2
|\ \ \ \ \
| * | | | | refspec-api: avoid uninitialized field in refspec itemJunio C Hamano2018-06-011-0/+2
* | | | | | Merge branch 'tg/doc-sec-list'Junio C Hamano2018-06-042-4/+20
|\ \ \ \ \ \
| * | | | | | note git-security@googlegroups.com in more placesThomas Gummerer2018-06-012-0/+16
| * | | | | | SubmittingPatches: replace numbered attributes with namesThomas Gummerer2018-06-011-4/+4
* | | | | | | Merge branch 'rd/p4-doc-markup-env'Junio C Hamano2018-06-041-5/+5
|\ \ \ \ \ \ \
| * | | | | | | p4.txt: Use backquotes for variable namesRobert P. J. Day2018-06-011-5/+5
| |/ / / / / /
* | | | | | | Merge branch 'nd/remote-update-doc'Junio C Hamano2018-06-041-2/+2
|\ \ \ \ \ \ \
| * | | | | | | remote: doc typofixDuy Nguyen2018-06-041-1/+1
| * | | | | | | remote.txt: update documentation for 'update' commandDuy Nguyen2018-06-011-2/+2
* | | | | | | | Merge branch 'jt/submodule-pull-recurse-rebase'Junio C Hamano2018-06-043-3/+29
|\ \ \ \ \ \ \ \
| * | | | | | | | submodule: do not pass null OID to setup_revisionsJonathan Tan2018-05-253-3/+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