summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
AgeCommit message (Expand)Author
2015-08-26Merge branch 'as/docfix-reflog-expire-unreachable'Junio C Hamano
2015-08-26Merge branch 'ep/http-configure-ssl-version'Junio C Hamano
2015-08-21Documentation/config: fix inconsistent label on gc.*.reflogExpireUnreachableAndreas Schwab
2015-08-19Merge branch 'jk/negative-hiderefs'Junio C Hamano
2015-08-17http: add support for specifying the SSL versionElia Pinto
2015-08-12Merge branch 'es/worktree-add-cleanup'Junio C Hamano
2015-08-12Merge branch 'pt/am-builtin'Junio C Hamano
2015-08-12Merge branch 'es/worktree-add'Junio C Hamano
2015-08-07refs: support negative transfer.hideRefsJeff King
2015-08-05git-am: add am.threeWay config variableRemi Lespinet
2015-08-03Merge branch 'gr/rebase-i-drop-warn'Junio C Hamano
2015-08-03Merge branch 'js/fsck-opt'Junio C Hamano
2015-08-03Merge branch 'mr/rebase-i-customize-insn-sheet'Junio C Hamano
2015-07-28Documentation/config: mention "now" and "never" for 'expire' settingsEric Sunshine
2015-07-28docs/config.txt: reorder hideRefs configJeff King
2015-07-24Revert "git-am: add am.threeWay config variable"Junio C Hamano
2015-07-20config: rename "gc.pruneWorktreesExpire" to "gc.worktreePruneExpire"Eric Sunshine
2015-07-20Documentation/git-worktree: wordsmith worktree-related manpagesMichael Haggerty
2015-07-20Documentation/config: fix stale "git prune --worktree" referenceMichael Haggerty
2015-06-30git rebase -i: warn about removed commitsGalan RĂ©mi
2015-06-24Merge branch 'rl/am-3way-config'Junio C Hamano
2015-06-23fsck: support ignoring objects in `git fsck` via fsck.skiplistJohannes Schindelin
2015-06-23fsck: git receive-pack: support excluding objects from fsck'ingJohannes Schindelin
2015-06-23fsck: support demoting errors to warningsJohannes Schindelin
2015-06-23fsck: document the new receive.fsck.<msg-id> optionsJohannes Schindelin
2015-06-15git-rebase--interactive.sh: add config option for custom instruction formatMichael Rappazzo
2015-06-11Merge branch 'jk/color-diff-plain-is-context'Junio C Hamano
2015-06-04git-am: add am.threeWay config variableRemi Lespinet
2015-06-01Merge branch 'fm/fetch-raw-sha1'Junio C Hamano
2015-05-27diff: accept color.diff.context as a synonym for "plain"Jeff King
2015-05-26Merge branch 'pt/pull-ff-vs-merge-ff'Junio C Hamano
2015-05-23upload-pack: optionally allow fetching reachable sha1Fredrik Medley
2015-05-22Merge branch 'mh/lockfile-retry'Junio C Hamano
2015-05-22Merge branch 'jk/asciidoc-markup-fix'Junio C Hamano
2015-05-22Merge branch 'ls/http-ssl-cipher-list'Junio C Hamano
2015-05-21config.txt: clarify allowTipSHA1InWant with camelCaseFredrik Medley
2015-05-18pull: make pull.ff=true override merge.ffPaul Tan
2015-05-14lock_packed_refs(): allow retries when acquiring the packed-refs lockMichael Haggerty
2015-05-13doc: convert \--option to --optionJeff King
2015-05-11Merge branch 'nd/multiple-work-trees'Junio C Hamano
2015-05-08http: add support for specifying an SSL cipher listLars Kellogg-Stedman
2015-03-23Merge branch 'jk/push-config'Junio C Hamano
2015-03-23Merge branch 'nd/config-doc-camelCase'Junio C Hamano
2015-03-23Merge branch 'mg/doc-status-color-slot' into maintJunio C Hamano
2015-03-23Merge branch 'jc/decorate-leaky-separator-color' into maintJunio C Hamano
2015-03-20Merge branch 'jc/decorate-leaky-separator-color'Junio C Hamano
2015-03-20Merge branch 'nd/versioncmp-prereleases'Junio C Hamano
2015-03-17Merge branch 'mg/doc-status-color-slot'Junio C Hamano
2015-03-14push: allow --follow-tags to be set by config push.followTagsDave Olszewski
2015-03-14Merge branch 'ms/submodule-update-config-doc' into maintJunio C Hamano