aboutsummaryrefslogtreecommitdiff
path: root/Documentation/config.txt
Commit message (Expand)AuthorAge
* Merge branch 'mc/push-recurse-submodules-config'Junio C Hamano2015-12-21
|\
| * push: add recurseSubmodules config optionMike Crowe2015-11-20
* | credential-cache: new option to ignore sighupNoam Postavsky2015-11-20
|/
* hideRefs: add support for matching full refsLukas Fleischer2015-11-05
* config.txt: document the semantics of hideRefs with namespacesLukas Fleischer2015-11-05
* Merge branch 'dt/log-follow-config'Junio C Hamano2015-10-15
|\
| * log: Update log.follow doc and add to config.txtEric N. Vander Weele2015-10-07
* | Merge branch 'jk/date-local'Junio C Hamano2015-10-05
|\ \
| * | Documentation/config: don't list date formatsJohn Keeping2015-09-03
| |/
* | Merge branch 'nk/stash-show-config'Junio C Hamano2015-10-05
|\ \
| * | stash: allow "stash show" diff output configurableNamhyung Kim2015-08-31
* | | Merge branch 'as/config-doc-markup-fix'Junio C Hamano2015-09-17
|\ \ \
| * | | Documentation/config: fix formatting for branch.*.rebase and pull.rebaseAndreas Schwab2015-09-12
* | | | Merge branch 'db/push-sign-if-asked'Junio C Hamano2015-08-31
|\ \ \ \
| * | | | push: add a config option push.gpgSign for default signed pushesDave Borowitz2015-08-19
| * | | | Merge branch 'jk/color-diff-plain-is-context' into maintJunio C Hamano2015-06-25
| |\ \ \ \
| * \ \ \ \ Merge branch 'pt/pull-ff-vs-merge-ff' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/asciidoc-markup-fix' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'jk/notes-merge-config'Junio C Hamano2015-08-31
|\ \ \ \ \ \ \ \
| * | | | | | | | notes: teach git-notes about notes.<name>.mergeStrategy optionJacob Keller2015-08-17
| * | | | | | | | notes: add notes.mergeStrategy option to select default strategyJacob Keller2015-08-17
| * | | | | | | | notes: document cat_sort_uniq rewriteModeJacob Keller2015-08-17
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'as/docfix-reflog-expire-unreachable'Junio C Hamano2015-08-26
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation/config: fix inconsistent label on gc.*.reflogExpireUnreachableAndreas Schwab2015-08-21
* | | | | | | | | Merge branch 'ep/http-configure-ssl-version'Junio C Hamano2015-08-26
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | http: add support for specifying the SSL versionElia Pinto2015-08-17
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/negative-hiderefs'Junio C Hamano2015-08-19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | refs: support negative transfer.hideRefsJeff King2015-08-07
| * | | | | | | | | docs/config.txt: reorder hideRefs configJeff King2015-07-28
| |/ / / / / / / /
* | | | | | | | | Merge branch 'es/worktree-add-cleanup'Junio C Hamano2015-08-12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation/config: mention "now" and "never" for 'expire' settingsEric Sunshine2015-07-28
* | | | | | | | | | Merge branch 'pt/am-builtin'Junio C Hamano2015-08-12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-am: add am.threeWay config variableRemi Lespinet2015-08-04
* | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | / / | | |_|_|_|_|_|/ / | |/| | | | | | |