summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
AgeCommit message (Expand)AuthorFilesLines
2017-10-18Merge branch 'jk/ref-filter-colors-fix'Libravatar Junio C Hamano1-17/+18
2017-10-17Revert "color: make "always" the same as "auto" in config"Libravatar Jeff King1-17/+18
2017-10-17Merge branch 'jk/ui-color-always-to-auto-maint' (early part) into jk/ref-filt...Libravatar Junio C Hamano1-18/+17
2017-10-04Merge branch 'jk/ui-color-always-to-auto-maint' into jk/ui-color-always-to-autoLibravatar Junio C Hamano1-18/+17
2017-10-04color: make "always" the same as "auto" in configLibravatar Jeff King1-18/+17
2017-09-24Documentation/config: clarify the meaning of submodule.<name>.updateLibravatar Stefan Beller1-4/+8
2017-09-10Merge branch 'jk/doc-the-this' into maintLibravatar Junio C Hamano1-2/+2
2017-09-10Merge branch 'ah/doc-empty-string-is-false' into maintLibravatar Junio C Hamano1-5/+5
2017-08-26Merge branch 'mh/ref-lock-entry'Libravatar Junio C Hamano1-0/+6
2017-08-26Merge branch 'jc/cutoff-config'Libravatar Junio C Hamano1-0/+2
2017-08-26Merge branch 'sb/diff-color-move'Libravatar Junio C Hamano1-2/+13
2017-08-24Merge branch 'jk/doc-the-this'Libravatar Junio C Hamano1-2/+2
2017-08-23Merge branch 'ah/doc-empty-string-is-false'Libravatar Junio C Hamano1-5/+5
2017-08-23refs: retry acquiring reference locks for 100msLibravatar Michael Haggerty1-0/+6
2017-08-22rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolvedLibravatar Junio C Hamano1-0/+2
2017-08-20doc: fix typo in sendemail.identityLibravatar Jeff King1-2/+2
2017-08-14doc: clarify "config --bool" behaviour with empty stringLibravatar Andreas Heiduk1-5/+5
2017-07-06Merge branch 'xz/send-email-batch-size'Libravatar Junio C Hamano1-0/+10
2017-07-05send-email: --batch-size to work around some SMTP server limitLibravatar xiaoqiang zhao1-0/+10
2017-06-30diff: document the new --color-moved settingLibravatar Stefan Beller1-2/+13
2017-06-26Merge branch 'dt/raise-core-packed-git-limit'Libravatar Junio C Hamano1-1/+2
2017-06-26Merge branch 'lb/status-stash-count'Libravatar Junio C Hamano1-3/+8
2017-06-24Merge branch 'jk/warn-add-gitlink'Libravatar Junio C Hamano1-0/+3
2017-06-21docs: update 64-bit core.packedGitLimit defaultLibravatar Jeff King1-1/+2
2017-06-18status: add optional stash count informationLibravatar Liam Beguin1-0/+5
2017-06-18stash: update documentation to use 'stash entry'Libravatar Liam Beguin1-3/+3
2017-06-15add: warn when adding an embedded repositoryLibravatar Jeff King1-0/+3
2017-06-13Merge branch 'sb/submodule-blanket-recursive'Libravatar Junio C Hamano1-0/+5
2017-06-04Merge branch 'jk/url-insteadof-config'Libravatar Junio C Hamano1-0/+7
2017-06-04Merge branch 'ah/doc-rev-parse-short-default'Libravatar Junio C Hamano1-0/+1
2017-06-01doc: rewrite description for rev-parse --shortLibravatar Andreas Heiduk1-0/+1
2017-06-01Introduce 'submodule.recurse' option for worktree manipulatorsLibravatar Stefan Beller1-0/+5
2017-06-01docs/config: mention protocol implications of url.insteadOfLibravatar Jeff King1-0/+7
2017-05-30Merge branch 'ab/conditional-config-with-symlinks'Libravatar Junio C Hamano1-0/+10
2017-05-29Merge branch 'km/log-showsignature-doc'Libravatar Junio C Hamano1-0/+4
2017-05-29Merge branch 'jk/doc-config-include'Libravatar Junio C Hamano1-10/+21
2017-05-29Merge branch 'sg/core-filemode-doc-typofix'Libravatar Junio C Hamano1-1/+1
2017-05-26docs/config.txt: fix indefinite article in core.fileMode descriptionLibravatar SZEDER Gábor1-1/+1
2017-05-23Merge branch 'jt/push-options-doc'Libravatar Junio C Hamano1-3/+2
2017-05-20config.txt: add an entry for log.showSignatureLibravatar Kyle Meyer1-0/+4
2017-05-17config: match both symlink & realpath versions in IncludeIf.gitdir:*Libravatar Ævar Arnfjörð Bjarmason1-0/+10
2017-05-12docs/config: consistify include.path examplesLibravatar Jeff King1-2/+2
2017-05-12docs/config: avoid the term "expand" for includesLibravatar Jeff King1-4/+4
2017-05-12docs/config: give a relative includeIf exampleLibravatar Jeff King1-0/+6
2017-05-12docs/config: clarify include/includeIf relationshipLibravatar Jeff King1-6/+11
2017-05-09docs: correct receive.advertisePushOptions defaultLibravatar Jonathan Tan1-3/+2
2017-04-28status: add color config slots for branch info in "--short --branch"Libravatar Stephen Kent1-1/+4
2017-03-30Merge branch 'bw/submodule-is-active'Libravatar Junio C Hamano1-2/+13
2017-03-28Merge branch 'km/config-grammofix' into maintLibravatar Junio C Hamano1-3/+3
2017-03-27Merge branch 'km/config-grammofix'Libravatar Junio C Hamano1-3/+3