summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mc/push-recurse-submodules-config'Junio C Hamano2015-12-211-0/+14
|\
| * push: add recurseSubmodules config optionMike Crowe2015-11-201-0/+14
* | credential-cache: new option to ignore sighupnp/credential-cache-sighupNoam Postavsky2015-11-201-0/+3
|/
* hideRefs: add support for matching full refsLukas Fleischer2015-11-051-1/+2
* config.txt: document the semantics of hideRefs with namespacesLukas Fleischer2015-11-051-0/+8
* Merge branch 'dt/log-follow-config'Junio C Hamano2015-10-151-0/+6
|\
| * log: Update log.follow doc and add to config.txtdt/log-follow-configEric N. Vander Weele2015-10-071-0/+6
* | Merge branch 'jk/date-local'Junio C Hamano2015-10-051-3/+1
|\ \
| * | Documentation/config: don't list date formatsJohn Keeping2015-09-031-3/+1
| |/
* | Merge branch 'nk/stash-show-config'Junio C Hamano2015-10-051-0/+10
|\ \
| * | stash: allow "stash show" diff output configurablenk/stash-show-configNamhyung Kim2015-08-311-0/+10
* | | Merge branch 'as/config-doc-markup-fix'Junio C Hamano2015-09-171-6/+6
|\ \ \
| * | | Documentation/config: fix formatting for branch.*.rebase and pull.rebaseas/config-doc-markup-fixAndreas Schwab2015-09-121-6/+6
* | | | Merge branch 'db/push-sign-if-asked'Junio C Hamano2015-08-311-0/+8
|\ \ \ \
| * | | | push: add a config option push.gpgSign for default signed pushesdb/push-sign-if-askedDave Borowitz2015-08-191-0/+8
| * | | | Merge branch 'jk/color-diff-plain-is-context' into maintJunio C Hamano2015-06-251-1/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'pt/pull-ff-vs-merge-ff' into maintJunio C Hamano2015-06-051-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/asciidoc-markup-fix' into maintJunio C Hamano2015-06-051-5/+5
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'jk/notes-merge-config'Junio C Hamano2015-08-311-2/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | notes: teach git-notes about notes.<name>.mergeStrategy optionjk/notes-merge-configJacob Keller2015-08-171-0/+6
| * | | | | | | | notes: add notes.mergeStrategy option to select default strategyJacob Keller2015-08-171-0/+6
| * | | | | | | | notes: document cat_sort_uniq rewriteModeJacob Keller2015-08-171-2/+2
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'as/docfix-reflog-expire-unreachable'Junio C Hamano2015-08-261-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation/config: fix inconsistent label on gc.*.reflogExpireUnreachableas/docfix-reflog-expire-unreachableAndreas Schwab2015-08-211-1/+1
* | | | | | | | | Merge branch 'ep/http-configure-ssl-version'Junio C Hamano2015-08-261-0/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | http: add support for specifying the SSL versionep/http-configure-ssl-versionElia Pinto2015-08-171-0/+23
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | / / | | |_|_|_|_|_|/ / | |/| | | | | | |
View Lorry Controller Status