summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/doc-the-this' into maintJunio C Hamano2017-09-101-2/+2
|\
| * doc: fix typo in sendemail.identityjk/doc-the-thisJeff King2017-08-201-2/+2
* | Merge branch 'ah/doc-empty-string-is-false' into maintJunio C Hamano2017-09-101-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
| * | | | | 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 '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"sk/status-short-branch-color-configStephen Kent2017-04-281-1/+4
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge branch 'bw/submodule-is-active'Junio C Hamano2017-03-301-2/+13
|\ \ \ \ \ \ \
| * | | | | | | submodule: decouple url and submodule interestBrandon Williams2017-03-181-2/+13
* | | | | | | | Merge branch 'km/config-grammofix'Junio C Hamano2017-03-271-3/+3
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | doc/config: grammar fixes for core.{editor,commentChar}km/config-grammofixKyle Meyer2017-03-231-3/+3
| * | | | | | | Merge branch 'jk/rebase-config-insn-fmt-docfix' into maintJunio C Hamano2016-11-291-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'sb/submodule-config-doc-drop-path' into maintJunio C Hamano2016-10-281-5/+6
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'mm/config-color-ui-default-to-auto' into maintJunio C Hamano2016-09-291-6/+12
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/reduce-gc-aggressive-depth' into maintJunio C Hamano2016-09-291-1/+1
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/push-default-doc-fix'Junio C Hamano2017-03-211-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| * | | | | | | | | | | push: mention "push.default=tracking" in the documentationab/push-default-doc-fixÆvar Arnfjörð Bjarmason2017-03-201-0/+2
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'nd/conditional-config-include'Junio C Hamano2017-03-211-7/+69
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | config: add conditional includeNguyễn Thái Ngọc Duy2017-03-111-0/+63
| * | | | | | | | | | | config.txt: reflow the second include.path paragraphNguyễn Thái Ngọc Duy2017-03-111-5/+4
| * | | | | | | | | | | config.txt: clarify multiple key values in include.pathNguyễn Thái Ngọc Duy2017-03-111-2/+2
| |/ / / / / / / / / /
View Lorry Controller Status