summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Git 2.14-rc0v2.14.0-rc0smapJunio C Hamano2017-07-131-4/+12
* Merge branch 'sb/pull-rebase-submodule'Junio C Hamano2017-07-131-6/+6
|\
| * pull: optionally rebase submodules (remote submodule changes only)Stefan Beller2017-06-231-6/+6
* | Merge branch 'sb/hashmap-customize-comparison'Junio C Hamano2017-07-131-309/+0
|\ \
| * | hashmap: migrate documentation from Documentation/technical into headersb/hashmap-customize-comparisonStefan Beller2017-06-301-309/+0
* | | Sync with v2.13.3Junio C Hamano2017-07-121-0/+9
|\ \ \
| * | | Git 2.13.3v2.13.3Junio C Hamano2017-07-121-0/+9
* | | | Hopefully the last batch before -rc0Junio C Hamano2017-07-121-0/+9
* | | | Merge branch 'ks/fix-rebase-doc-picture'Junio C Hamano2017-07-121-1/+1
|\ \ \ \
| * | | | doc: correct a mistake in an illustrationks/fix-rebase-doc-pictureKaartic Sivaraam2017-07-101-1/+1
* | | | | Merge branch 'sb/submodule-doc'Junio C Hamano2017-07-124-36/+234
|\ \ \ \ \
| * | | | | submodules: overhaul documentationsb/submodule-docStefan Beller2017-06-224-36/+234
* | | | | | Sync with maintJunio C Hamano2017-07-102-20/+53
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Prepare for 2.13.3Junio C Hamano2017-07-101-0/+53
| * | | | | Merge branch 'ah/doc-pretty-color-auto-prefix' into maintJunio C Hamano2017-07-101-5/+6
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ah/doc-gitattributes-empty-index' into maintJunio C Hamano2017-07-101-1/+1
| |\ \ \ \ \ \
* | | | | | | | Sixteenth batch for 2.14Junio C Hamano2017-07-101-0/+14
* | | | | | | | Fifteenth batch for 2.14Junio C Hamano2017-07-061-0/+24
* | | | | | | | Merge branch 'xz/send-email-batch-size'Junio C Hamano2017-07-062-0/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | send-email: --batch-size to work around some SMTP server limitxiaoqiang zhao2017-07-052-0/+25
* | | | | | | | | Fourteenth batch for 2.14Junio C Hamano2017-07-051-0/+12
* | | | | | | | | Thirteenth batch for 2.14Junio C Hamano2017-06-301-0/+23
* | | | | | | | | Merge branch 'vs/typofixes'Junio C Hamano2017-06-305-5/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Spelling fixesvs/typofixesVille Skyttä2017-06-275-5/+5
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'ah/doc-pretty-color-auto-prefix'Junio C Hamano2017-06-301-5/+6
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | doc: clarify syntax for %C(auto,...) in pretty formatsah/doc-pretty-color-auto-prefixAndreas Heiduk2017-06-241-5/+6
* | | | | | | | | Merge branch 'ks/submodule-add-doc'Junio C Hamano2017-06-301-28/+21
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Documentation/git-submodule: cleanup "add" sectionks/submodule-add-docKaartic Sivaraam2017-06-221-28/+21
* | | | | | | | | Twelfth batch for 2.14Junio C Hamano2017-06-261-1/+11
* | | | | | | | | Merge branch 'dt/raise-core-packed-git-limit'Junio C Hamano2017-06-261-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | docs: update 64-bit core.packedGitLimit defaultdt/raise-core-packed-git-limitJeff King2017-06-211-1/+2
* | | | | | | | | | Merge branch 'lb/status-stash-count'Junio C Hamano2017-06-267-35/+49
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | glossary: define 'stash entry'lb/status-stash-countLiam Beguin2017-06-181-0/+4
| * | | | | | | | | | status: add optional stash count informationLiam Beguin2017-06-182-0/+8
| * | | | | | | | | | stash: update documentation to use 'stash entry'Liam Beguin2017-06-185-35/+37
* | | | | | | | | | | Sync with 2.13.2Junio C Hamano2017-06-242-12/+17
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | Git 2.13.2v2.13.2Junio C Hamano2017-06-241-0/+17
| * | | | | | | | | | Merge branch 'sn/reset-doc-typofix' into maintJunio C Hamano2017-06-241-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/doc-pretty-formats' into maintJunio C Hamano2017-06-241-2/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/submodule-rm-absorb' into maintJunio C Hamano2017-06-241-4/+5
| |\ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | Eleventh batch for 2.14Junio C Hamano2017-06-241-15/+46
* | | | | | | | | | | | | | Merge branch 'jk/warn-add-gitlink'Junio C Hamano2017-06-242-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | add: warn when adding an embedded repositoryJeff King2017-06-152-0/+10
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'sn/reset-doc-typofix'Junio C Hamano2017-06-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | doc: git-reset: fix a trivial typosn/reset-doc-typofixŠtěpán Němec2017-06-151-1/+1
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'sg/doc-pretty-formats'Junio C Hamano2017-06-241-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | docs/pretty-formats: stress that %- removes all preceding line-feedssg/doc-pretty-formatsSZEDER Gábor2017-06-151-2/+2
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'ah/doc-gitattributes-empty-index'Junio C Hamano2017-06-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | / | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | doc: do not use `rm .git/index` when normalizing line endingsah/doc-gitattributes-empty-indexAndreas Heiduk2017-06-151-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Tenth batch for 2.14Junio C Hamano2017-06-221-0/+28