Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'mc/push-recurse-submodules-config' | Junio C Hamano | 2015-12-21 |
|\ | |||
| * | push: add recurseSubmodules config option | Mike Crowe | 2015-11-20 |
* | | credential-cache: new option to ignore sighup | Noam Postavsky | 2015-11-20 |
|/ | |||
* | hideRefs: add support for matching full refs | Lukas Fleischer | 2015-11-05 |
* | config.txt: document the semantics of hideRefs with namespaces | Lukas Fleischer | 2015-11-05 |
* | Merge branch 'dt/log-follow-config' | Junio C Hamano | 2015-10-15 |
|\ | |||
| * | log: Update log.follow doc and add to config.txt | Eric N. Vander Weele | 2015-10-07 |
* | | Merge branch 'jk/date-local' | Junio C Hamano | 2015-10-05 |
|\ \ | |||
| * | | Documentation/config: don't list date formats | John Keeping | 2015-09-03 |
| |/ | |||
* | | Merge branch 'nk/stash-show-config' | Junio C Hamano | 2015-10-05 |
|\ \ | |||
| * | | stash: allow "stash show" diff output configurable | Namhyung Kim | 2015-08-31 |
* | | | Merge branch 'as/config-doc-markup-fix' | Junio C Hamano | 2015-09-17 |
|\ \ \ | |||
| * | | | Documentation/config: fix formatting for branch.*.rebase and pull.rebase | Andreas Schwab | 2015-09-12 |
* | | | | Merge branch 'db/push-sign-if-asked' | Junio C Hamano | 2015-08-31 |
|\ \ \ \ | |||
| * | | | | push: add a config option push.gpgSign for default signed pushes | Dave Borowitz | 2015-08-19 |
| * | | | | Merge branch 'jk/color-diff-plain-is-context' into maint | Junio C Hamano | 2015-06-25 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'pt/pull-ff-vs-merge-ff' into maint | Junio C Hamano | 2015-06-05 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'jk/asciidoc-markup-fix' into maint | Junio C Hamano | 2015-06-05 |
| |\ \ \ \ \ \ | |||
* | \ \ \ \ \ \ | Merge branch 'jk/notes-merge-config' | Junio C Hamano | 2015-08-31 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | notes: teach git-notes about notes.<name>.mergeStrategy option | Jacob Keller | 2015-08-17 |
| * | | | | | | | | notes: add notes.mergeStrategy option to select default strategy | Jacob Keller | 2015-08-17 |
| * | | | | | | | | notes: document cat_sort_uniq rewriteMode | Jacob Keller | 2015-08-17 |
| | |_|_|_|_|/ / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'as/docfix-reflog-expire-unreachable' | Junio C Hamano | 2015-08-26 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | Documentation/config: fix inconsistent label on gc.*.reflogExpireUnreachable | Andreas Schwab | 2015-08-21 |
* | | | | | | | | | Merge branch 'ep/http-configure-ssl-version' | Junio C Hamano | 2015-08-26 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | http: add support for specifying the SSL version | Elia Pinto | 2015-08-17 |
| | |/ / / / / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'jk/negative-hiderefs' | Junio C Hamano | 2015-08-19 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | refs: support negative transfer.hideRefs | Jeff King | 2015-08-07 |
| * | | | | | | | | | docs/config.txt: reorder hideRefs config | Jeff King | 2015-07-28 |
| |/ / / / / / / / | |||
* | | | | | | | | | Merge branch 'es/worktree-add-cleanup' | Junio C Hamano | 2015-08-12 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | Documentation/config: mention "now" and "never" for 'expire' settings | Eric Sunshine | 2015-07-28 |
* | | | | | | | | | | Merge branch 'pt/am-builtin' | Junio C Hamano | 2015-08-12 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | git-am: add am.threeWay config variable | Remi Lespinet | 2015-08-04 |
* | | | | | | | | | | | Merge branch 'es/worktree-add' | Junio C Hamano | 2015-08-12 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| / / / / / / / / / | |/ / / / / / / / / | |||
| * | | | | | | | | | config: rename "gc.pruneWorktreesExpire" to "gc.worktreePruneExpire" | Eric Sunshine | 2015-07-20 |
| * | | | | | | | | | Documentation/git-worktree: wordsmith worktree-related manpages | Michael Haggerty | 2015-07-20 |
| * | | | | | | | | | Documentation/config: fix stale "git prune --worktree" reference | Michael Haggerty | 2015-07-20 |
* | | | | | | | | | | Merge branch 'gr/rebase-i-drop-warn' | Junio C Hamano | 2015-08-03 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | git rebase -i: warn about removed commits | Galan RĂ©mi | 2015-06-30 |
* | | | | | | | | | | | Merge branch 'js/fsck-opt' | Junio C Hamano | 2015-08-03 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | fsck: support ignoring objects in `git fsck` via fsck.skiplist | Johannes Schindelin | 2015-06-23 |
| * | | | | | | | | | | | fsck: git receive-pack: support excluding objects from fsck'ing | Johannes Schindelin | 2015-06-23 |
| * | | | | | | | | | | | fsck: support demoting errors to warnings | Johannes Schindelin | 2015-06-23 |
| * | | | | | | | | | | | fsck: document the new receive.fsck.<msg-id> options | Johannes Schindelin | 2015-06-23 |
* | | | | | | | | | | | | Merge branch 'mr/rebase-i-customize-insn-sheet' | Junio C Hamano | 2015-08-03 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |||
| * | | | | | | | | | | | git-rebase--interactive.sh: add config option for custom instruction format | Michael Rappazzo | 2015-06-15 |
* | | | | | | | | | | | | Revert "git-am: add am.threeWay config variable" | Junio C Hamano | 2015-07-24 |
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||
* | | | | | | | | | | | Merge branch 'rl/am-3way-config' | Junio C Hamano | 2015-06-24 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | |||
| * | | | | | | | | | | git-am: add am.threeWay config variable | Remi Lespinet | 2015-06-04 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'jk/color-diff-plain-is-context' | Junio C Hamano | 2015-06-11 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | / / | | |_|_|_|_|_|/ / | |/| | | | | | | |