summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Fourth batch for 2.14Junio C Hamano2017-05-301-0/+55
* Merge branch 'ab/conditional-config-with-symlinks'Junio C Hamano2017-05-301-0/+10
|\
| * config: match both symlink & realpath versions in IncludeIf.gitdir:*ab/conditional-config-with-symlinksÆvar Arnfjörð Bjarmason2017-05-171-0/+10
* | Merge branch 'jt/send-email-validate-hook'Junio C Hamano2017-05-302-0/+9
|\ \
| * | send-email: support validate hookJonathan Tan2017-05-162-0/+9
* | | Merge branch 'bp/sub-process-convert-filter'Junio C Hamano2017-05-301-0/+59
|\ \ \
| * | | sub-process: move sub-process functions into separate filesBen Peart2017-05-151-0/+59
* | | | Third batch for 2.14Junio C Hamano2017-05-291-0/+93
* | | | Merge branch 'km/log-showsignature-doc'Junio C Hamano2017-05-291-0/+4
|\ \ \ \
| * | | | config.txt: add an entry for log.showSignaturekm/log-showsignature-docKyle Meyer2017-05-201-0/+4
* | | | | Merge branch 'jk/update-links-in-docs'Junio C Hamano2017-05-291-1/+1
|\ \ \ \ \
| * | | | | doc: use https links to Wikipedia to avoid http redirectsjk/update-links-in-docsSven Strickroth2017-05-151-1/+1
* | | | | | Merge branch 'ja/do-not-ask-needless-questions'Junio C Hamano2017-05-291-1/+1
|\ \ \ \ \ \
| * | | | | | read-tree -m: make error message for merging 0 trees less smart aleckJean-Noel Avila2017-05-121-1/+1
* | | | | | | Merge branch 'jk/doc-config-include'Junio C Hamano2017-05-291-10/+21
|\ \ \ \ \ \ \
| * | | | | | | docs/config: consistify include.path examplesjk/doc-config-includeJeff King2017-05-121-2/+2
| * | | | | | | docs/config: avoid the term "expand" for includesJeff King2017-05-121-4/+4
| * | | | | | | docs/config: give a relative includeIf exampleJeff King2017-05-121-0/+6
| * | | | | | | docs/config: clarify include/includeIf relationshipJeff King2017-05-121-6/+11
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'sg/core-filemode-doc-typofix'Junio C Hamano2017-05-291-1/+1
|\ \ \ \ \ \ \
| * | | | | | | docs/config.txt: fix indefinite article in core.fileMode descriptionsg/core-filemode-doc-typofixSZEDER Gábor2017-05-261-1/+1
* | | | | | | | Merge branch 'jc/repack-threads'Junio C Hamano2017-05-291-1/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | repack: accept --threads=<n> and pass it down to pack-objectsjc/repack-threadsJunio C Hamano2017-04-271-1/+4
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Second batch for 2.14Junio C Hamano2017-05-231-0/+29
* | | | | | | | Merge branch 'jt/push-options-doc'Junio C Hamano2017-05-232-9/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | receive-pack: verify push options in certjt/push-options-docJonathan Tan2017-05-101-6/+26
| * | | | | | | | docs: correct receive.advertisePushOptions defaultJonathan Tan2017-05-091-3/+2
| |/ / / / / / /
* | | | | | | | Merge branch 'ab/doc-replace-gmane-links'Junio C Hamano2017-05-232-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | doc: replace more gmane linksab/doc-replace-gmane-linksJunio C Hamano2017-05-091-1/+1
| * | | | | | | | doc: replace a couple of broken gmane linksÆvar Arnfjörð Bjarmason2017-05-082-2/+2
* | | | | | | | | Start post 2.13 cycleJunio C Hamano2017-05-161-0/+97
* | | | | | | | | Merge branch 'js/larger-timestamps'Junio C Hamano2017-05-161-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | timestamp_t: a new data type for timestampsJohannes Schindelin2017-04-271-4/+4
* | | | | | | | | | Merge branch 'jn/credential-doc-on-clear'Junio C Hamano2017-05-161-10/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | credential doc: make multiple-helper behavior more prominentjn/credential-doc-on-clearJonathan Nieder2017-05-021-10/+10
* | | | | | | | | | | Merge branch 'ab/clone-no-tags'Junio C Hamano2017-05-161-1/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | clone: add a --no-tags option to clone without tagsÆvar Arnfjörð Bjarmason2017-05-011-1/+13
* | | | | | | | | | | | Merge branch 'sk/status-short-branch-color-config'Junio C Hamano2017-05-161-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | status: add color config slots for branch info in "--short --branch"sk/status-short-branch-color-configStephen Kent2017-04-281-1/+4
* | | | | | | | | | | | Git 2.13v2.13.0Junio C Hamano2017-05-092-0/+13
* | | | | | | | | | | | Sync with v2.12.3Junio C Hamano2017-05-0810-10/+115
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | / / / | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | Git 2.12.3v2.12.3Junio C Hamano2017-05-052-3/+11
| * | | | | | | | | | Merge branch 'maint-2.11' into maintJunio C Hamano2017-05-059-7/+104
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| | * | | | | | | | | Git 2.11.2v2.11.2Junio C Hamano2017-05-052-1/+14
| | * | | | | | | | | Merge branch 'maint-2.10' into maint-2.11Junio C Hamano2017-05-058-7/+91
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Git 2.10.3v2.10.3Junio C Hamano2017-05-052-1/+9
| | | * | | | | | | | Merge branch 'maint-2.9' into maint-2.10Junio C Hamano2017-05-057-6/+82
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Git 2.9.4v2.9.4Junio C Hamano2017-05-052-1/+10
| | | | * | | | | | | | Merge branch 'maint-2.8' into maint-2.9Junio C Hamano2017-05-056-5/+73
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Git 2.8.5v2.8.5Junio C Hamano2017-05-052-1/+14