summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'as/docfix-reflog-expire-unreachable' into maintJunio C Hamano2015-09-031-1/+1
|\
| * Documentation/config: fix inconsistent label on gc.*.reflogExpireUnreachableas/docfix-reflog-expire-unreachableAndreas Schwab2015-08-211-1/+1
* | Revert "git-am: add am.threeWay config variable"Junio C Hamano2015-07-241-8/+0
* | Merge branch 'rl/am-3way-config'Junio C Hamano2015-06-241-0/+8
|\ \
| * | git-am: add am.threeWay config variablerl/am-3way-configRemi Lespinet2015-06-041-0/+8
* | | Merge branch 'jk/color-diff-plain-is-context'Junio C Hamano2015-06-111-1/+2
|\ \ \
| * | | diff: accept color.diff.context as a synonym for "plain"Jeff King2015-05-271-1/+2
* | | | Merge branch 'fm/fetch-raw-sha1'Junio C Hamano2015-06-011-2/+8
|\ \ \ \
| * | | | upload-pack: optionally allow fetching reachable sha1fm/fetch-raw-sha1Fredrik Medley2015-05-221-0/+6
| * | | | config.txt: clarify allowTipSHA1InWant with camelCaseFredrik Medley2015-05-211-2/+2
| | |/ / | |/| |
* | | | Merge branch 'pt/pull-ff-vs-merge-ff'Junio C Hamano2015-05-261-1/+1
|\ \ \ \
| * | | | pull: make pull.ff=true override merge.ffPaul Tan2015-05-181-1/+1
| |/ / /
* | | | Merge branch 'mh/lockfile-retry'Junio C Hamano2015-05-221-0/+6
|\ \ \ \
| * | | | lock_packed_refs(): allow retries when acquiring the packed-refs lockmh/lockfile-retryMichael Haggerty2015-05-141-0/+6
* | | | | Merge branch 'jk/asciidoc-markup-fix'Junio C Hamano2015-05-221-5/+5
|\ \ \ \ \
| * | | | | doc: convert \--option to --optionJeff King2015-05-121-5/+5
* | | | | | Merge branch 'ls/http-ssl-cipher-list'Junio C Hamano2015-05-221-0/+13
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | http: add support for specifying an SSL cipher listls/http-ssl-cipher-listLars Kellogg-Stedman2015-05-081-0/+13
| |/ / / /
| * | | | Merge branch 'mg/doc-status-color-slot' into maintJunio C Hamano2015-03-231-2/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'jc/decorate-leaky-separator-color' into maintJunio C Hamano2015-03-231-49/+75
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ms/submodule-update-config-doc' into maintJunio C Hamano2015-03-131-5/+9
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'mm/am-c-doc' into maintJunio C Hamano2015-03-061-0/+7
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/conf-var-doc' into maintJunio C Hamano2015-03-051-8/+7
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'nd/multiple-work-trees'Junio C Hamano2015-05-111-0/+9
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | gc: support prune --worktreesNguyễn Thái Ngọc Duy2014-12-011-0/+7
| * | | | | | | | | setup.c: support multi-checkout repo setupNguyễn Thái Ngọc Duy2014-12-011-0/+2
* | | | | | | | | | Merge branch 'jk/push-config'Junio C Hamano2015-03-231-0/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | push: allow --follow-tags to be set by config push.followTagsjk/push-configDave Olszewski2015-03-141-0/+6
* | | | | | | | | | | Merge branch 'nd/config-doc-camelCase'Junio C Hamano2015-03-231-121/+121
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | *config.txt: stick to camelCase naming conventionnd/config-doc-camelCaseNguyễn Thái Ngọc Duy2015-03-131-121/+121
* | | | | | | | | | | Merge branch 'jc/decorate-leaky-separator-color'Junio C Hamano2015-03-201-49/+73
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | log --decorate: do not leak "commit" color into the next itemjc/decorate-leaky-separator-colorJunio C Hamano2015-03-041-0/+7
| * | | | | | | | | | Documentation/config.txt: simplify boolean description in the syntax sectionJunio C Hamano2015-03-041-2/+2
| * | | | | | | | | | Documentation/config.txt: describe 'color' value type in the "Values" sectionJunio C Hamano2015-03-041-16/+13
| * | | | | | | | | | Documentation/config.txt: have a separate "Values" sectionJunio C Hamano2015-03-041-8/+31
| * | | | | | | | | | Documentation/config.txt: describe the structure first and then meaningJunio C Hamano2015-03-041-16/+15
| * | | | | | | | | | Documentation/config.txt: explain multi-valued variables onceJunio C Hamano2015-03-041-4/+3
| * | | | | | | | | | Documentation/config.txt: avoid unnecessary negationJunio C Hamano2015-03-041-3/+3
* | | | | | | | | | | Merge branch 'nd/versioncmp-prereleases'Junio C Hamano2015-03-201-0/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | config.txt: update versioncmp.prereleaseSuffixNguyễn Thái Ngọc Duy2015-03-101-2/+7
| * | | | | | | | | | | versionsort: support reorder prerelease suffixesNguyễn Thái Ngọc Duy2015-02-271-0/+7
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'jk/colors-fix' into maintJunio C Hamano2014-12-221-0/+4
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/doc-status-color-slot'Junio C Hamano2015-03-171-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | / | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | config,completion: add color.status.unmergedmg/doc-status-color-slotMichael J Gruber2015-03-101-2/+4
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ms/submodule-update-config-doc'Junio C Hamano2015-03-061-5/+9
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | submodule: improve documentation of update subcommandms/submodule-update-config-docMichal Sojka2015-03-021-5/+9
* | | | | | | | | | Merge branch 'mm/am-c-doc'Junio C Hamano2015-03-051-0/+7
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Documentation/config.txt: document mailinfo.scissorsMatthieu Moy2015-02-201-0/+7
* | | | | | | | | | Merge branch 'jc/conf-var-doc'Junio C Hamano2015-02-221-8/+7
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | config.txt: mark deprecated variables more prominentlyJunio C Hamano2015-01-281-4/+4
View Lorry Controller Status