summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Git 2.15-rc1v2.15.0-rc1Junio C Hamano2017-10-111-0/+17
* Merge branch 'hn/string-list-doc'Junio C Hamano2017-10-111-1/+1
|\
| * api-argv-array.txt: remove broken link to string-list APIhn/string-list-docTodd Zullinger2017-10-061-1/+1
* | Merge branch 'tb/show-trailers-in-ref-filter'Junio C Hamano2017-10-111-2/+6
|\ \
| * | ref-filter.c: use trailer_opts to format trailersTaylor Blau2017-10-021-1/+4
| * | doc: use "`<literal>`"-style quoting for literal stringsTaylor Blau2017-10-021-3/+3
| * | doc: 'trailers' is the preferred way to format trailersTaylor Blau2017-10-021-1/+2
* | | Merge branch 'jr/hash-migration-plan-doc'Junio C Hamano2017-10-112-0/+798
|\ \ \
| * | | technical doc: add a design doc for hash function transitionjr/hash-migration-plan-docJonathan Nieder2017-09-282-0/+798
* | | | Prepare for -rc1Junio C Hamano2017-10-071-3/+38
* | | | Merge branch 'jk/ui-color-always-to-auto'Junio C Hamano2017-10-073-18/+27
|\ \ \ \
| * \ \ \ Merge branch 'jk/ui-color-always-to-auto-maint' into jk/ui-color-always-to-autojk/ui-color-always-to-autoJunio C Hamano2017-10-043-18/+27
| |\ \ \ \
| | * | | | color: make "always" the same as "auto" in configJeff King2017-10-041-18/+17
| | * | | | provide --color option for all ref-filter usersJeff King2017-10-042-0/+10
* | | | | | Git 2.15-rc0v2.15.0-rc0Junio C Hamano2017-10-051-0/+16
|/ / / / /
* | | | | The twelfth batch for 2.15Junio C Hamano2017-10-031-0/+24
* | | | | Merge branch 'ad/doc-markup-fix'Junio C Hamano2017-10-031-1/+1
|\ \ \ \ \
| * | | | | doc: correct command formattingad/doc-markup-fixAdam Dinwoodie2017-09-291-1/+1
* | | | | | Merge branch 'mr/doc-negative-pathspec'Junio C Hamano2017-10-034-1/+12
|\ \ \ \ \ \
| * | | | | | docs: improve discoverability of exclude pathspecmr/doc-negative-pathspecManav Rathi2017-09-254-1/+12
* | | | | | | Merge branch 'jk/no-optional-locks'Junio C Hamano2017-10-031-0/+12
|\ \ \ \ \ \ \
| * | | | | | | git: add --no-optional-locks optionJeff King2017-09-271-0/+12
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'hn/string-list-doc'Junio C Hamano2017-10-031-209/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | string-list.h: move documentation from Documentation/api/ into headerHan-Wen Nienhuys2017-09-271-209/+0
* | | | | | | Merge branch 'sd/branch-copy'Junio C Hamano2017-10-031-1/+13
|\ \ \ \ \ \ \
| * | | | | | | branch: add a --copy (-c) option to go with --move (-m)Sahil Dua2017-06-181-1/+13
* | | | | | | | Merge branch 'js/rebase-i-final'Junio C Hamano2017-10-031-7/+9
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | rebase -i: rearrange fixup/squash lines using the rebase--helperJohannes Schindelin2017-07-271-7/+9
* | | | | | | | The eleventh batch for 2.15Junio C Hamano2017-09-291-0/+18
* | | | | | | | Merge branch 'sb/doc-config-submodule-update'Junio C Hamano2017-09-291-4/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation/config: clarify the meaning of submodule.<name>.updatesb/doc-config-submodule-updateStefan Beller2017-09-241-4/+8
* | | | | | | | | Merge branch 'sb/merge-commit-msg-hook'Junio C Hamano2017-09-291-5/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation/githooks: mention merge in commit-msg hooksb/merge-commit-msg-hookStefan Beller2017-09-221-5/+4
* | | | | | | | | | Merge branch 'mk/describe-match-with-all'Junio C Hamano2017-09-291-10/+14
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | describe: teach --match to handle branches and remotesmk/describe-match-with-allMax Kirillov2017-09-201-10/+14
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | The tenth batch for 2.15Junio C Hamano2017-09-281-0/+47
* | | | | | | | | Merge branch 'jc/merge-x-theirs-docfix'Junio C Hamano2017-09-281-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | merge-strategies: avoid implying that "-s theirs" existsjc/merge-x-theirs-docfixJunio C Hamano2017-09-251-1/+2
* | | | | | | | | | Merge branch 'ks/doc-use-camelcase-for-config-name'Junio C Hamano2017-09-282-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | doc: camelCase the config variables to improve readabilityks/doc-use-camelcase-for-config-nameKaartic Sivaraam2017-09-252-3/+3
* | | | | | | | | | | Merge branch 'jk/doc-read-tree-table-asciidoctor-fix'Junio C Hamano2017-09-281-0/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | doc: put literal block delimiter around tablejk/doc-read-tree-table-asciidoctor-fixJeff King2017-09-241-0/+2
* | | | | | | | | | | | Merge branch 'ic/fix-filter-branch-to-handle-tag-without-tagger'Junio C Hamano2017-09-281-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | filter-branch: stash away ref map in a branchIan Campbell2017-09-221-1/+7
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Sync with 2.14.2Junio C Hamano2017-09-266-0/+95
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | / / / | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | Git 2.14.2v2.14.2Junio C Hamano2017-09-221-0/+11
| * | | | | | | | | | Sync with 2.13.6Junio C Hamano2017-09-225-0/+84
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Git 2.13.6v2.13.6maint-2.13Junio C Hamano2017-09-221-0/+17
| | * | | | | | | | | Sync with 2.12.5Junio C Hamano2017-09-224-0/+67
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| | | * | | | | | | | Git 2.12.5v2.12.5maint-2.12Junio C Hamano2017-09-221-0/+17