summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/negative-hiderefs'Junio C Hamano2015-08-191-17/+20
|\
| * refs: support negative transfer.hideRefsjk/negative-hiderefsJeff King2015-08-071-0/+5
| * docs/config.txt: reorder hideRefs configJeff King2015-07-281-17/+15
* | Merge branch 'es/worktree-add-cleanup'Junio C Hamano2015-08-121-5/+11
|\ \
| * | Documentation/config: mention "now" and "never" for 'expire' settingsEric Sunshine2015-07-281-5/+11
* | | Merge branch 'pt/am-builtin'Junio C Hamano2015-08-121-0/+8
|\ \ \
| * | | git-am: add am.threeWay config variableRemi Lespinet2015-08-041-0/+8
* | | | Merge branch 'es/worktree-add'Junio C Hamano2015-08-121-6/+6
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | config: rename "gc.pruneWorktreesExpire" to "gc.worktreePruneExpire"Eric Sunshine2015-07-201-2/+1
| * | Documentation/git-worktree: wordsmith worktree-related manpagesMichael Haggerty2015-07-201-3/+4
| * | Documentation/config: fix stale "git prune --worktree" referenceMichael Haggerty2015-07-201-1/+1
* | | Merge branch 'gr/rebase-i-drop-warn'Junio C Hamano2015-08-031-0/+11
|\ \ \
| * | | git rebase -i: warn about removed commitsGalan Rémi2015-06-301-0/+11
* | | | Merge branch 'js/fsck-opt'Junio C Hamano2015-08-031-0/+41
|\ \ \ \
| * | | | fsck: support ignoring objects in `git fsck` via fsck.skiplistjs/fsck-optJohannes Schindelin2015-06-231-0/+8
| * | | | fsck: git receive-pack: support excluding objects from fsck'ingJohannes Schindelin2015-06-231-0/+8
| * | | | fsck: support demoting errors to warningsJohannes Schindelin2015-06-231-0/+11
| * | | | fsck: document the new receive.fsck.<msg-id> optionsJohannes Schindelin2015-06-231-0/+14
* | | | | Merge branch 'mr/rebase-i-customize-insn-sheet'Junio C Hamano2015-08-031-0/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | git-rebase--interactive.sh: add config option for custom instruction formatmr/rebase-i-customize-insn-sheetMichael Rappazzo2015-06-151-0/+5
* | | | | 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