summaryrefslogtreecommitdiffstats
path: root/Documentation/config.txt (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/ref-filter-colors-fix'Junio C Hamano2017-10-181-17/+18
|\
| * Revert "color: make "always" the same as "auto" in config"Jeff King2017-10-171-17/+18
| * Merge branch 'jk/ui-color-always-to-auto-maint' (early part) into jk/ref-filt...Junio C Hamano2017-10-171-18/+17
| |\
| * \ Merge branch 'jk/doc-the-this' into maintJunio C Hamano2017-09-101-2/+2
| |\ \
| * \ \ Merge branch 'ah/doc-empty-string-is-false' into maintJunio C Hamano2017-09-101-5/+5
| |\ \ \
* | \ \ \ Merge branch 'jk/ui-color-always-to-auto-maint' into jk/ui-color-always-to-autoJunio C Hamano2017-10-041-18/+17
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | color: make "always" the same as "auto" in configJeff King2017-10-041-18/+17
| |/ / /
* | | | Documentation/config: clarify the meaning of submodule.<name>.updateStefan Beller2017-09-241-4/+8
* | | | Merge branch 'mh/ref-lock-entry'Junio C Hamano2017-08-271-0/+6
|\ \ \ \
| * | | | refs: retry acquiring reference locks for 100msMichael Haggerty2017-08-231-0/+6
| |/ / /
* | | | Merge branch 'jc/cutoff-config'Junio C Hamano2017-08-271-0/+2
|\ \ \ \
| * | | | rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolvedJunio C Hamano2017-08-221-0/+2
| |/ / /
* | | | Merge branch 'sb/diff-color-move'Junio C Hamano2017-08-271-2/+13
|\ \ \ \
| * | | | diff: document the new --color-moved settingStefan Beller2017-06-301-2/+13
* | | | | Merge branch 'jk/doc-the-this'Junio C Hamano2017-08-241-2/+2
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | doc: fix typo in sendemail.identityJeff King2017-08-201-2/+2
* | | | | Merge branch 'ah/doc-empty-string-is-false'Junio C Hamano2017-08-231-5/+5
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | doc: clarify "config --bool" behaviour with empty stringAndreas Heiduk2017-08-151-5/+5
* | | | Merge branch 'xz/send-email-batch-size'Junio C Hamano2017-07-071-0/+10
|\ \ \ \ | |_|_|/ |/| | |
| * | | send-email: --batch-size to work around some SMTP server limitxiaoqiang zhao2017-07-051-0/+10
* | | | Merge branch 'dt/raise-core-packed-git-limit'Junio C Hamano2017-06-261-1/+2
|\ \ \ \
| * | | | docs: update 64-bit core.packedGitLimit defaultJeff King2017-06-211-1/+2
| |/ / /
* | | | Merge branch 'lb/status-stash-count'Junio C Hamano2017-06-261-3/+8
|\ \ \ \
| * | | | status: add optional stash count informationLiam Beguin2017-06-191-0/+5
| * | | | stash: update documentation to use 'stash entry'Liam Beguin2017-06-191-3/+3
* | | | | Merge branch 'jk/warn-add-gitlink'Junio C Hamano2017-06-241-0/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | add: warn when adding an embedded repositoryJeff King2017-06-151-0/+3
* | | | | Merge branch 'sb/submodule-blanket-recursive'Junio C Hamano2017-06-131-0/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Introduce 'submodule.recurse' option for worktree manipulatorsStefan Beller2017-06-011-0/+5
* | | | | Merge branch 'jk/url-insteadof-config'Junio C Hamano2017-06-041-0/+7
|\ \ \ \ \
| * | | | | docs/config: mention protocol implications of url.insteadOfJeff King2017-06-011-0/+7
| | |/ / / | |/| | |
* | | | | Merge branch 'ah/doc-rev-parse-short-default'Junio C Hamano2017-06-041-0/+1
|\ \ \ \ \
| * | | | | doc: rewrite description for rev-parse --shortAndreas Heiduk2017-06-011-0/+1
| |/ / / /
* | | | | Merge branch 'ab/conditional-config-with-symlinks'Junio C Hamano2017-05-301-0/+10
|\ \ \ \ \
| * | | | | config: match both symlink & realpath versions in IncludeIf.gitdir:*Ævar Arnfjörð Bjarmason2017-05-171-0/+10
| |/ / / /
* | | | | Merge branch 'km/log-showsignature-doc'Junio C Hamano2017-05-291-0/+4
|\ \ \ \ \
| * | | | | config.txt: add an entry for log.showSignatureKyle Meyer2017-05-201-0/+4
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jk/doc-config-include'Junio C Hamano2017-05-291-10/+21
|\ \ \ \ \
| * | | | | docs/config: consistify include.path examplesJeff 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 descriptionSZEDER Gábor2017-05-261-1/+1
* | | | | Merge branch 'jt/push-options-doc'Junio C Hamano2017-05-231-3/+2
|\ \ \ \ \
| * | | | | docs: correct receive.advertisePushOptions defaultJonathan Tan2017-05-091-3/+2
| | |_|/ / | |/| | |
| * | | | Merge branch 'km/config-grammofix' into maintJunio C Hamano2017-03-281-3/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'ab/push-default-doc-fix' into maintJunio C Hamano2017-03-241-0/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'dt/gc-ignore-old-gc-logs' into maintJunio C Hamano2017-03-211-0/+6
| |\ \ \ \ \ \
* | | | | | | | status: add color config slots for branch info in "--short --branch"Stephen Kent2017-04-281-1/+4
| |_|_|_|_|/ / |/| | | | | |