aboutsummaryrefslogtreecommitdiff
path: root/Documentation/config.txt
Commit message (Expand)AuthorAge
...
* | | | | | | | | | | Merge branch 'es/worktree-add'Junio C Hamano2015-08-12
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| / / / / / / / / / | |/ / / / / / / / /
| * | | | | | | | | config: rename "gc.pruneWorktreesExpire" to "gc.worktreePruneExpire"Eric Sunshine2015-07-20
| * | | | | | | | | Documentation/git-worktree: wordsmith worktree-related manpagesMichael Haggerty2015-07-20
| * | | | | | | | | Documentation/config: fix stale "git prune --worktree" referenceMichael Haggerty2015-07-20
* | | | | | | | | | Merge branch 'gr/rebase-i-drop-warn'Junio C Hamano2015-08-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git rebase -i: warn about removed commitsGalan Rémi2015-06-30
* | | | | | | | | | | Merge branch 'js/fsck-opt'Junio C Hamano2015-08-03
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fsck: support ignoring objects in `git fsck` via fsck.skiplistJohannes Schindelin2015-06-23
| * | | | | | | | | | | fsck: git receive-pack: support excluding objects from fsck'ingJohannes Schindelin2015-06-23
| * | | | | | | | | | | fsck: support demoting errors to warningsJohannes Schindelin2015-06-23
| * | | | | | | | | | | fsck: document the new receive.fsck.<msg-id> optionsJohannes Schindelin2015-06-23
* | | | | | | | | | | | Merge branch 'mr/rebase-i-customize-insn-sheet'Junio C Hamano2015-08-03
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | git-rebase--interactive.sh: add config option for custom instruction formatMichael Rappazzo2015-06-15
* | | | | | | | | | | | Revert "git-am: add am.threeWay config variable"Junio C Hamano2015-07-24
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'rl/am-3way-config'Junio C Hamano2015-06-24
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | git-am: add am.threeWay config variableRemi Lespinet2015-06-04
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/color-diff-plain-is-context'Junio C Hamano2015-06-11
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | / / | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | diff: accept color.diff.context as a synonym for "plain"Jeff King2015-05-27
* | | | | | | | | Merge branch 'fm/fetch-raw-sha1'Junio C Hamano2015-06-01
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | upload-pack: optionally allow fetching reachable sha1Fredrik Medley2015-05-22
| * | | | | | | | config.txt: clarify allowTipSHA1InWant with camelCaseFredrik Medley2015-05-21
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'pt/pull-ff-vs-merge-ff'Junio C Hamano2015-05-26
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | pull: make pull.ff=true override merge.ffPaul Tan2015-05-18
| |/ / / / / /
* | | | | | | Merge branch 'mh/lockfile-retry'Junio C Hamano2015-05-22
|\ \ \ \ \ \ \
| * | | | | | | lock_packed_refs(): allow retries when acquiring the packed-refs lockMichael Haggerty2015-05-14
* | | | | | | | Merge branch 'jk/asciidoc-markup-fix'Junio C Hamano2015-05-22
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | doc: convert \--option to --optionJeff King2015-05-12
* | | | | | | | Merge branch 'ls/http-ssl-cipher-list'Junio C Hamano2015-05-22
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | http: add support for specifying an SSL cipher listLars Kellogg-Stedman2015-05-08
| |/ / / / / /
| * | | | | | Merge branch 'mg/doc-status-color-slot' into maintJunio C Hamano2015-03-23
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/decorate-leaky-separator-color' into maintJunio C Hamano2015-03-23
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ms/submodule-update-config-doc' into maintJunio C Hamano2015-03-13
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'mm/am-c-doc' into maintJunio C Hamano2015-03-06
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/conf-var-doc' into maintJunio C Hamano2015-03-05
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/multiple-work-trees'Junio C Hamano2015-05-11
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | / / / | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | gc: support prune --worktreesNguyễn Thái Ngọc Duy2014-12-01
| * | | | | | | | | | setup.c: support multi-checkout repo setupNguyễn Thái Ngọc Duy2014-12-01
* | | | | | | | | | | Merge branch 'jk/push-config'Junio C Hamano2015-03-23
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | push: allow --follow-tags to be set by config push.followTagsDave Olszewski2015-03-14
* | | | | | | | | | | | Merge branch 'nd/config-doc-camelCase'Junio C Hamano2015-03-23
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| * | | | | | | | | | | *config.txt: stick to camelCase naming conventionNguyễn Thái Ngọc Duy2015-03-13
* | | | | | | | | | | | Merge branch 'jc/decorate-leaky-separator-color'Junio C Hamano2015-03-20
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| * | | | | | | | | | | log --decorate: do not leak "commit" color into the next itemJunio C Hamano2015-03-04
| * | | | | | | | | | | Documentation/config.txt: simplify boolean description in the syntax sectionJunio C Hamano2015-03-04
| * | | | | | | | | | | Documentation/config.txt: describe 'color' value type in the "Values" sectionJunio C Hamano2015-03-04
| * | | | | | | | | | | Documentation/config.txt: have a separate "Values" sectionJunio C Hamano2015-03-04
| * | | | | | | | | | | Documentation/config.txt: describe the structure first and then meaningJunio C Hamano2015-03-04
| * | | | | | | | | | | Documentation/config.txt: explain multi-valued variables onceJunio C Hamano2015-03-04
| * | | | | | | | | | | Documentation/config.txt: avoid unnecessary negationJunio C Hamano2015-03-04
* | | | | | | | | | | | Merge branch 'nd/versioncmp-prereleases'Junio C Hamano2015-03-20
|\ \ \ \ \ \ \ \ \ \ \ \