summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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 namend/log-graph-configurable-colorsJeff King2017-02-021-0/+3
| * | log --graph: customize the graph lines with config log.graphColorsNguyễn Thái Ngọc Duy2017-01-231-0/+4
* | | Merge branch 'sg/fix-versioncmp-with-common-suffix'Junio C Hamano2017-01-231-11/+33
|\ \ \
| * | | versioncmp: generalize version sort suffix reorderingsg/fix-versioncmp-with-common-suffixSZEDER 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-101-4/+5
|\ \ \ \
| * | | | config.abbrev: document the new default that auto-scalesjc/abbrev-autoscale-configJunio C Hamano2016-12-221-4/+5
| |/ / /
* | | | Merge branch 'dt/smart-http-detect-server-going-away'Junio C Hamano2017-01-101-0/+5
|\ \ \ \
| * | | | upload-pack: optionally allow fetching any sha1dt/smart-http-detect-server-going-awayDavid Turner2016-11-181-0/+5
| |/ / /
* | | | Merge branch 'mm/gc-safety-doc'Junio C Hamano2017-01-101-1/+3
|\ \ \ \
| * | | | git-gc.txt: expand discussion of races with other processesmm/gc-safety-docMatt McCutchen2016-11-161-1/+3
* | | | | Merge branch 'mm/push-social-engineering-attack-doc'Junio C Hamano2017-01-101-3/+14
|\ \ \ \ \
| * | | | | doc: mention transfer data leaks in more placesmm/push-social-engineering-attack-docMatt McCutchen2016-11-141-3/+14
| |/ / / /
* | | | | Merge branch 'bw/transport-protocol-policy'Junio C Hamano2016-12-271-0/+46
|\ \ \ \ \
| * | | | | transport: add protocol policy config optionBrandon Williams2016-12-151-0/+46
* | | | | | Merge branch 'jk/http-walker-limit-redirect-2.9'Junio C Hamano2016-12-191-0/+10
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | http: make redirects more obviousJeff King2016-12-061-0/+10
| * | | | Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maintJunio C Hamano2016-09-081-7/+5
| |\ \ \ \
* | \ \ \ \ Merge branch 'jk/rebase-config-insn-fmt-docfix'Junio C Hamano2016-10-311-1/+1
|\ \ \ \ \ \
| * | | | | | doc: fix missing "::" in config listjk/rebase-config-insn-fmt-docfixJeff King2016-10-301-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'sb/submodule-config-doc-drop-path'Junio C Hamano2016-10-171-5/+6
|\ \ \ \ \ \
| * | | | | | documentation: improve submodule.<name>.{url, path} descriptionsb/submodule-config-doc-drop-pathStefan Beller2016-10-111-5/+6
| |/ / / / /
* | | | | | Merge branch 'ps/http-gssapi-cred-delegation'Junio C Hamano2016-10-061-0/+14
|\ \ \ \ \ \
| * | | | | | http: control GSSAPI credential delegationps/http-gssapi-cred-delegationPetr Stodulka2016-09-291-0/+14
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'mm/config-color-ui-default-to-auto'Junio C Hamano2016-09-261-6/+12
|\ \ \ \ \ \
| * | | | | | Documentation/config: default for color.* is color.uimm/config-color-ui-default-to-autoMatthieu Moy2016-09-161-6/+12
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jk/reduce-gc-aggressive-depth'Junio C Hamano2016-09-211-1/+1
|\ \ \ \ \ \
| * | | | | | gc: default aggressive depth to 50jk/reduce-gc-aggressive-depthJeff King2016-08-111-1/+1
* | | | | | | Merge branch 'sb/submodule-clone-rr'Junio C Hamano2016-09-081-0/+12
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | clone: recursive and reference option triggers submodule alternatessb/submodule-clone-rrStefan Beller2016-08-171-0/+12
* | | | | | | receive-pack: allow a maximum input size to be specifiedcc/receive-pack-limitJeff King2016-08-241-0/+6
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'jt/format-patch-from-config'Junio C Hamano2016-08-101-0/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | format-patch: format.from gives the default for --fromjt/format-patch-from-configJosh Triplett2016-08-011-0/+10
| | |_|/ / | |/| | |
| * | | | Merge branch 'mm/doc-tt' into maintJunio C Hamano2016-07-281-20/+20
| |\ \ \ \
| * \ \ \ \ Merge branch 'tr/doc-tt' into maintJunio C Hamano2016-07-061-42/+42
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'jk/push-progress'Junio C Hamano2016-08-031-0/+9
|\ \ \ \ \ \ \
| * | | | | | | receive-pack: send keepalives during quiet periodsjk/push-progressJeff King2016-07-201-0/+9
* | | | | | | | Merge branch 'sb/push-options'Junio C Hamano2016-08-031-2/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | receive-pack: implement advertising and receiving push optionsStefan Beller2016-07-141-2/+7
* | | | | | | | | Merge branch 'jc/renormalize-merge-kill-safer-crlf'Junio C Hamano2016-07-251-7/+5
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | convert: unify the "auto" handling of CRLFTorsten Bögershausen2016-07-061-7/+5
* | | | | | | | Merge branch 'nd/fetch-ref-summary'Junio C Hamano2016-07-191-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | fetch: reduce duplicate in ref update status lines with placeholderNguyễn Thái Ngọc Duy2016-07-061-0/+5
| | |_|/ / / / / | |/| | | | | |
View Lorry Controller Status