summaryrefslogtreecommitdiffstats
path: root/Documentation/config.txt (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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}Kyle 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-301-6/+12
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/reduce-gc-aggressive-depth' into maintJunio C Hamano2016-09-301-1/+1
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'ab/push-default-doc-fix'Junio C Hamano2017-03-211-0/+2
|\ \ \ \ \ \ \
| * | | | | | | push: mention "push.default=tracking" in the documentationÆ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-121-0/+63
| * | | | | | | | config.txt: reflow the second include.path paragraphNguyễn Thái Ngọc Duy2017-03-121-5/+4
| * | | | | | | | config.txt: clarify multiple key values in include.pathNguyễn Thái Ngọc Duy2017-03-121-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.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-141-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-181-1/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'mm/push-social-engineering-attack-doc' into maintJunio C Hamano2017-01-181-3/+14
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'dt/smart-http-detect-server-going-away' into maintJunio C Hamano2017-01-181-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 partPatrick 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 sectionDavid Pursehouse2017-02-161-1/+1
* | | | | | | | | | | | | | | Merge branch 'cw/log-updates-for-all-refs-really'Junio C Hamano2017-02-031-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | refs: add option core.logAllRefUpdates = alwaysCornelius Weig2017-01-311-0/+2
| * | | | | | | | | | | | | | | config: add markup to core.logAllRefUpdates docCornelius Weig2017-01-301-3/+3
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'nd/log-graph-configurable-colors'Junio C Hamano2017-02-021-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | document behavior of empty color nameJeff King2017-02-021-0/+3
| * | | | | | | | | | | | | | log --graph: customize the graph lines with config log.graphColorsNguyễn Thái Ngọc Duy2017-01-241-0/+4
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'sg/fix-versioncmp-with-common-suffix'Junio C Hamano2017-01-241-11/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | versioncmp: generalize version sort suffix reorderingSZEDER Gábor2017-01-121-10/+26
| * | | | | | | | | | | | | | versioncmp: use earliest-longest contained suffix to determine sorting orderSZEDER Gábor2016-12-081-2/+4
| * | | | | | | | | | | | | | versioncmp: cope with common part overlapping with prerelease suffixSZEDER Gábor2016-12-081-2/+6
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jc/abbrev-autoscale-config'Junio C Hamano2017-01-111-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | config.abbrev: document the new default that auto-scalesJunio C Hamano2016-12-221-4/+5
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'dt/smart-http-detect-server-going-away'Junio C Hamano2017-01-111-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | upload-pack: optionally allow fetching any sha1David Turner2016-11-181-0/+5
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'mm/gc-safety-doc'Junio C Hamano2017-01-111-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | git-gc.txt: expand discussion of races with other processesMatt McCutchen2016-11-161-1/+3
* | | | | | | | | | | | Merge branch 'mm/push-social-engineering-attack-doc'Junio C Hamano2017-01-111-3/+14
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |