summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ah/doc-rev-parse-short-default' into maintJunio C Hamano2017-06-051-0/+1
|\
| * doc: rewrite description for rev-parse --shortah/doc-rev-parse-short-defaultAndreas Heiduk2017-06-011-0/+1
* | Merge branch 'sg/core-filemode-doc-typofix' into maintJunio C Hamano2017-06-051-1/+1
|\ \
| * | docs/config.txt: fix indefinite article in core.fileMode descriptionsg/core-filemode-doc-typofixSZEDER Gábor2017-05-261-1/+1
* | | Merge branch 'jk/url-insteadof-config' into maintJunio C Hamano2017-06-051-0/+7
|\ \ \
| * | | docs/config: mention protocol implications of url.insteadOfjk/url-insteadof-configJeff King2017-06-011-0/+7
| | |/ | |/|
* | | Merge branch 'km/log-showsignature-doc' into maintJunio C Hamano2017-06-041-0/+4
|\ \ \
| * | | config.txt: add an entry for log.showSignaturekm/log-showsignature-docKyle Meyer2017-05-201-0/+4
* | | | Merge branch 'jt/push-options-doc' into maintJunio C Hamano2017-06-041-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
| |\ \ \ \ \
* | | | | | | 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 '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
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'cc/split-index-config'Junio C Hamano2017-03-171-0/+29
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Documentation/git-update-index: explain splitIndex.*Christian Couder2017-03-061-1/+1
| * | | | | | | | | Documentation/config: add splitIndex.sharedIndexExpireChristian Couder2017-03-061-0/+12
| * | | | | | | | | Documentation/config: add splitIndex.maxPercentChangeChristian Couder2017-03-011-0/+13
| * | | | | | | | | Documentation/config: add information for core.splitIndexChristian Couder2017-03-011-0/+4
* | | | | | | | | | Documentation: improve description for core.quotePathah/doc-ls-files-quotepathAndreas Heiduk2017-03-021-10/+13
* | | | | | | | | | Merge branch 'dt/gc-ignore-old-gc-logs'Junio C Hamano2017-02-271-0/+6
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | gc: ignore old gc.log filesDavid Turner2017-02-131-0/+6
| * | | | | | | | | Merge branch 'jc/abbrev-autoscale-config' into maintJunio C Hamano2017-01-311-4/+5
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'mm/gc-safety-doc' into maintJunio C Hamano2017-01-171-1/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/push-social-engineering-attack-doc' into maintJunio C Hamano2017-01-171-3/+14
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dt/smart-http-detect-server-going-away' into maintJunio C Hamano2017-01-171-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/http-walker-limit-redirect' into maintJunio C Hamano2017-01-171-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sf/putty-w-args'Junio C Hamano2017-02-271-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | connect: Add the envvar GIT_SSH_VARIANT and ssh.variant configSegev Finer2017-02-011-0/+11
* | | | | | | | | | | | | | | | Merge branch 'ps/urlmatch-wildcard'Junio C Hamano2017-02-271-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | urlmatch: allow globbing for the URL host partps/urlmatch-wildcardPatrick Steinhardt2017-02-011-1/+4
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'dp/submodule-doc-markup-fix'Junio C Hamano2017-02-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | config.txt: fix formatting of submodule.alternateErrorStrategy sectiondp/submodule-doc-markup-fixDavid Pursehouse2017-02-161-1/+1