summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
AgeCommit message (Expand)AuthorFilesLines
2015-08-03Merge branch 'gr/rebase-i-drop-warn'Libravatar Junio C Hamano1-0/+11
2015-08-03Merge branch 'js/fsck-opt'Libravatar Junio C Hamano1-0/+41
2015-08-03Merge branch 'mr/rebase-i-customize-insn-sheet'Libravatar Junio C Hamano1-0/+5
2015-07-28Documentation/config: mention "now" and "never" for 'expire' settingsLibravatar Eric Sunshine1-5/+11
2015-07-28docs/config.txt: reorder hideRefs configLibravatar Jeff King1-17/+15
2015-07-24Revert "git-am: add am.threeWay config variable"Libravatar Junio C Hamano1-8/+0
2015-07-20config: rename "gc.pruneWorktreesExpire" to "gc.worktreePruneExpire"Libravatar Eric Sunshine1-2/+1
2015-07-20Documentation/git-worktree: wordsmith worktree-related manpagesLibravatar Michael Haggerty1-3/+4
2015-07-20Documentation/config: fix stale "git prune --worktree" referenceLibravatar Michael Haggerty1-1/+1
2015-06-30git rebase -i: warn about removed commitsLibravatar Galan Rémi1-0/+11
2015-06-25Merge branch 'jk/color-diff-plain-is-context' into maintLibravatar Junio C Hamano1-1/+2
2015-06-24Merge branch 'rl/am-3way-config'Libravatar Junio C Hamano1-0/+8
2015-06-23fsck: support ignoring objects in `git fsck` via fsck.skiplistLibravatar Johannes Schindelin1-0/+8
2015-06-23fsck: git receive-pack: support excluding objects from fsck'ingLibravatar Johannes Schindelin1-0/+8
2015-06-23fsck: support demoting errors to warningsLibravatar Johannes Schindelin1-0/+11
2015-06-23fsck: document the new receive.fsck.<msg-id> optionsLibravatar Johannes Schindelin1-0/+14
2015-06-15git-rebase--interactive.sh: add config option for custom instruction formatLibravatar Michael Rappazzo1-0/+5
2015-06-11Merge branch 'jk/color-diff-plain-is-context'Libravatar Junio C Hamano1-1/+2
2015-06-05Merge branch 'pt/pull-ff-vs-merge-ff' into maintLibravatar Junio C Hamano1-1/+1
2015-06-05Merge branch 'jk/asciidoc-markup-fix' into maintLibravatar Junio C Hamano1-5/+5
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