summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
AgeCommit message (Expand)AuthorFilesLines
2015-09-03Merge branch 'as/docfix-reflog-expire-unreachable' into maintLibravatar Junio C Hamano1-1/+1
2015-08-21Documentation/config: fix inconsistent label on gc.*.reflogExpireUnreachableLibravatar Andreas Schwab1-1/+1
2015-07-24Revert "git-am: add am.threeWay config variable"Libravatar Junio C Hamano1-8/+0
2015-06-24Merge branch 'rl/am-3way-config'Libravatar Junio C Hamano1-0/+8
2015-06-11Merge branch 'jk/color-diff-plain-is-context'Libravatar Junio C Hamano1-1/+2
2015-06-04git-am: add am.threeWay config variableLibravatar Remi Lespinet1-0/+8
2015-06-01Merge branch 'fm/fetch-raw-sha1'Libravatar Junio C Hamano1-2/+8
2015-05-27diff: accept color.diff.context as a synonym for "plain"Libravatar Jeff King1-1/+2
2015-05-26Merge branch 'pt/pull-ff-vs-merge-ff'Libravatar Junio C Hamano1-1/+1
2015-05-22upload-pack: optionally allow fetching reachable sha1Libravatar Fredrik Medley1-0/+6
2015-05-22Merge branch 'mh/lockfile-retry'Libravatar Junio C Hamano1-0/+6
2015-05-22Merge branch 'jk/asciidoc-markup-fix'Libravatar Junio C Hamano1-5/+5
2015-05-22Merge branch 'ls/http-ssl-cipher-list'Libravatar Junio C Hamano1-0/+13
2015-05-21config.txt: clarify allowTipSHA1InWant with camelCaseLibravatar Fredrik Medley1-2/+2
2015-05-18pull: make pull.ff=true override merge.ffLibravatar Paul Tan1-1/+1
2015-05-14lock_packed_refs(): allow retries when acquiring the packed-refs lockLibravatar Michael Haggerty1-0/+6
2015-05-12doc: convert \--option to --optionLibravatar Jeff King1-5/+5
2015-05-11Merge branch 'nd/multiple-work-trees'Libravatar Junio C Hamano1-0/+9
2015-05-08http: add support for specifying an SSL cipher listLibravatar Lars Kellogg-Stedman1-0/+13
2015-03-23Merge branch 'jk/push-config'Libravatar Junio C Hamano1-0/+6
2015-03-23Merge branch 'nd/config-doc-camelCase'Libravatar Junio C Hamano1-121/+121
2015-03-23Merge branch 'mg/doc-status-color-slot' into maintLibravatar Junio C Hamano1-2/+3
2015-03-23Merge branch 'jc/decorate-leaky-separator-color' into maintLibravatar Junio C Hamano1-49/+75
2015-03-20Merge branch 'jc/decorate-leaky-separator-color'Libravatar Junio C Hamano1-49/+73
2015-03-20Merge branch 'nd/versioncmp-prereleases'Libravatar Junio C Hamano1-0/+12
2015-03-17Merge branch 'mg/doc-status-color-slot'Libravatar Junio C Hamano1-2/+4
2015-03-14push: allow --follow-tags to be set by config push.followTagsLibravatar Dave Olszewski1-0/+6
2015-03-13Merge branch 'ms/submodule-update-config-doc' into maintLibravatar Junio C Hamano1-5/+9
2015-03-13*config.txt: stick to camelCase naming conventionLibravatar Nguyễn Thái Ngọc Duy1-121/+121
2015-03-10config,completion: add color.status.unmergedLibravatar Michael J Gruber1-2/+4
2015-03-10config.txt: update versioncmp.prereleaseSuffixLibravatar Nguyễn Thái Ngọc Duy1-2/+7
2015-03-06Merge branch 'ms/submodule-update-config-doc'Libravatar Junio C Hamano1-5/+9
2015-03-06Merge branch 'mm/am-c-doc' into maintLibravatar Junio C Hamano1-0/+7
2015-03-05Merge branch 'jc/conf-var-doc' into maintLibravatar Junio C Hamano1-8/+7
2015-03-05Merge branch 'mm/am-c-doc'Libravatar Junio C Hamano1-0/+7
2015-03-04log --decorate: do not leak "commit" color into the next itemLibravatar Junio C Hamano1-0/+7
2015-03-04Documentation/config.txt: simplify boolean description in the syntax sectionLibravatar Junio C Hamano1-2/+2
2015-03-04Documentation/config.txt: describe 'color' value type in the "Values" sectionLibravatar Junio C Hamano1-16/+13
2015-03-04Documentation/config.txt: have a separate "Values" sectionLibravatar Junio C Hamano1-8/+31
2015-03-04Documentation/config.txt: describe the structure first and then meaningLibravatar Junio C Hamano1-16/+15
2015-03-04Documentation/config.txt: explain multi-valued variables onceLibravatar Junio C Hamano1-4/+3
2015-03-04Documentation/config.txt: avoid unnecessary negationLibravatar Junio C Hamano1-3/+3
2015-03-02submodule: improve documentation of update subcommandLibravatar Michal Sojka1-5/+9
2015-02-27versionsort: support reorder prerelease suffixesLibravatar Nguyễn Thái Ngọc Duy1-0/+7
2015-02-22Merge branch 'jc/conf-var-doc'Libravatar Junio C Hamano1-8/+7
2015-02-20Documentation/config.txt: document mailinfo.scissorsLibravatar Matthieu Moy1-0/+7
2015-02-11Merge branch 'jc/push-to-checkout'Libravatar Junio C Hamano1-1/+5
2015-02-11Merge branch 'sb/atomic-push'Libravatar Junio C Hamano1-0/+5
2015-01-28config.txt: mark deprecated variables more prominentlyLibravatar Junio C Hamano1-4/+4
2015-01-28config.txt: clarify that add.ignore-errors is deprecatedLibravatar Junio C Hamano1-5/+4