summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge branch 'nd/config-doc-camelCase'Junio C Hamano2015-03-2337-212/+212
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | *config.txt: stick to camelCase naming conventionnd/config-doc-camelCaseNguyễn Thái Ngọc Duy2015-03-1337-212/+212
* | | | | | | | | | | | | Post 2.3 cycle (batch #11)Junio C Hamano2015-03-201-0/+64
* | | | | | | | | | | | | Merge branch 'jc/decorate-leaky-separator-color'Junio C Hamano2015-03-201-49/+73
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | log --decorate: do not leak "commit" color into the next itemjc/decorate-leaky-separator-colorJunio C Hamano2015-03-041-0/+7
| * | | | | | | | | | | | Documentation/config.txt: simplify boolean description in the syntax sectionJunio C Hamano2015-03-041-2/+2
| * | | | | | | | | | | | Documentation/config.txt: describe 'color' value type in the "Values" sectionJunio C Hamano2015-03-041-16/+13
| * | | | | | | | | | | | Documentation/config.txt: have a separate "Values" sectionJunio C Hamano2015-03-041-8/+31
| * | | | | | | | | | | | Documentation/config.txt: describe the structure first and then meaningJunio C Hamano2015-03-041-16/+15
| * | | | | | | | | | | | Documentation/config.txt: explain multi-valued variables onceJunio C Hamano2015-03-041-4/+3
| * | | | | | | | | | | | Documentation/config.txt: avoid unnecessary negationJunio C Hamano2015-03-041-3/+3
* | | | | | | | | | | | | Merge branch 'km/imap-send-libcurl-options'Junio C Hamano2015-03-201-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | imap-send: use cURL automatically when NO_OPENSSL definedkm/imap-send-libcurl-optionsKyle J. McKay2015-03-101-1/+2
* | | | | | | | | | | | | Merge branch 'nd/versioncmp-prereleases'Junio C Hamano2015-03-201-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | config.txt: update versioncmp.prereleaseSuffixNguyễn Thái Ngọc Duy2015-03-101-2/+7
| * | | | | | | | | | | | | versionsort: support reorder prerelease suffixesNguyễn Thái Ngọc Duy2015-02-271-0/+7
* | | | | | | | | | | | | | Post 2.3 cyce (batch #10)Junio C Hamano2015-03-171-0/+319
* | | | | | | | | | | | | | Merge branch 'mg/doc-status-color-slot'Junio C Hamano2015-03-171-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | config,completion: add color.status.unmergedmg/doc-status-color-slotMichael J Gruber2015-03-101-2/+4
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'mg/status-v-v'Junio C Hamano2015-03-171-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | commit/status: show the index-worktree diff with -v -vMichael J Gruber2015-03-061-0/+4
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Sync with 2.3.3Junio C Hamano2015-03-132-1/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | / / / / / / | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Git 2.3.3v2.3.3Junio C Hamano2015-03-132-1/+41
| * | | | | | | | | | | Merge branch 'mr/doc-clean-f-f' into maintJunio C Hamano2015-03-131-2/+6
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/doc-remote-tags-or-not' into maintJunio C Hamano2015-03-131-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ms/submodule-update-config-doc' into maintJunio C Hamano2015-03-133-37/+64
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/apply-beyond-symlink' into maintJunio C Hamano2015-03-131-1/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/expire-updateref-fixes'Junio C Hamano2015-03-101-58/+86
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | reflog_expire(): ignore --updateref for symbolic referencesMichael Haggerty2015-03-051-1/+2
| * | | | | | | | | | | | | | | | reflog: improve and update documentationMichael Haggerty2015-03-051-58/+85
| * | | | | | | | | | | | | | | | Merge branch 'sb/atomic-push' into mh/ref-trans-value-checkJunio C Hamano2015-02-094-4/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'ms/submodule-update-config-doc'Junio C Hamano2015-03-063-37/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | submodule: improve documentation of update subcommandms/submodule-update-config-docMichal Sojka2015-03-023-37/+64
* | | | | | | | | | | | | | | | | Merge branch 'mg/doc-remote-tags-or-not'Junio C Hamano2015-03-061-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | git-remote.txt: describe behavior without --tags and --no-tagsmg/doc-remote-tags-or-notMichael J Gruber2015-03-021-0/+3
* | | | | | | | | | | | | | | | | Merge branch 'mr/doc-clean-f-f'Junio C Hamano2015-03-061-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Documentation/git-clean.txt: document that -f may need to be given twicemr/doc-clean-f-fMikko Rapeli2015-02-261-2/+6
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Sync with 2.3.2Junio C Hamano2015-03-062-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Git 2.3.2v2.3.2Junio C Hamano2015-03-062-1/+13
| * | | | | | | | | | | | | | | Merge branch 'mm/am-c-doc' into maintJunio C Hamano2015-03-062-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Sync with maintJunio C Hamano2015-03-051-0/+68
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Prepare for 2.3.2Junio C Hamano2015-03-051-0/+68
| * | | | | | | | | | | | | | | | Merge branch 'jc/conf-var-doc' into maintJunio C Hamano2015-03-052-8/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/remote-set-url-doc' into maintJunio C Hamano2015-03-051-6/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'mm/am-c-doc'Junio C Hamano2015-03-052-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Documentation/git-am.txt: mention mailinfo.scissors config variablemm/am-c-docMatthieu Moy2015-02-201-1/+2
| * | | | | | | | | | | | | | | | | Documentation/config.txt: document mailinfo.scissorsMatthieu Moy2015-02-201-0/+7
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jc/apply-beyond-symlink'Junio C Hamano2015-03-031-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | apply: reject input that touches outside the working areaJunio C Hamano2015-02-101-1/+11
| | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'jk/strbuf-doc-to-header'Junio C Hamano2015-02-251-351/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \