summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rv/sendemail-tocmd-in-config-and-completion'Junio C Hamano2017-11-271-0/+1
|\
| * Documentation/config: add sendemail.tocmd to list preceding "See git-send-ema...Rasmus Villemoes2017-11-141-0/+1
* | Merge branch 'bp/fsmonitor'Junio C Hamano2017-11-211-0/+7
|\ \ | |/ |/|
| * fsmonitor: add documentation for the fsmonitor extension.Ben Peart2017-10-011-0/+7
* | Merge branch 'sb/blame-config-doc'Junio C Hamano2017-11-091-0/+17
|\ \
| * | config: document blame configurationsb/blame-config-docStefan Beller2017-11-061-0/+17
* | | Merge branch 'mp/push-pushoption-config'Junio C Hamano2017-11-061-0/+29
|\ \ \
| * | | builtin/push.c: add push.pushOption configmp/push-pushoption-configMarius Paliga2017-10-241-0/+29
| * | | 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-autojk/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
| | |/ / / /
* | | | | | run-command: add hint when a hook is ignoreddm/run-command-ignored-hook-adviseDamien Marié2017-10-101-0/+3
|/ / / / /
* | | | | Documentation/config: clarify the meaning of submodule.<name>.updatesb/doc-config-submodule-updateStefan Beller2017-09-241-4/+8
| |_|_|/ |/| | |
* | | | Merge branch 'mh/ref-lock-entry'Junio C Hamano2017-08-261-0/+6
|\ \ \ \
| * | | | refs: retry acquiring reference locks for 100msmh/ref-lock-entryMichael Haggerty2017-08-231-0/+6
| |/ / /
* | | | Merge branch 'jc/cutoff-config'Junio C Hamano2017-08-261-0/+2
|\ \ \ \
| * | | | rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolvedjc/cutoff-configJunio C Hamano2017-08-221-0/+2
| |/ / /
* | | | Merge branch 'sb/diff-color-move'Junio C Hamano2017-08-261-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.identityjk/doc-the-thisJeff 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 stringah/doc-empty-string-is-falseAndreas Heiduk2017-08-141-5/+5
* | | | Merge branch 'xz/send-email-batch-size'Junio C Hamano2017-07-061-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 defaultdt/raise-core-packed-git-limitJeff 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-181-0/+5
| * | | | stash: update documentation to use 'stash entry'Liam Beguin2017-06-181-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.insteadOfjk/url-insteadof-configJeff 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 --shortah/doc-rev-parse-short-defaultAndreas 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:*ab/conditional-config-with-symlinksÆ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.showSignaturekm/log-showsignature-docKyle Meyer2017-05-201-0/+4
| | |_|_|/ | |/| | |
* | | | | 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
View Lorry Controller Status