Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | / / | | |_|_|_|_|_|/ / | |/| | | | | | | | ||||
| * | | | | | | | | diff: accept color.diff.context as a synonym for "plain" | Jeff King | 2015-05-27 | |
* | | | | | | | | | Merge branch 'fm/fetch-raw-sha1' | Junio C Hamano | 2015-06-01 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||
| * | | | | | | | | upload-pack: optionally allow fetching reachable sha1 | Fredrik Medley | 2015-05-22 | |
| * | | | | | | | | config.txt: clarify allowTipSHA1InWant with camelCase | Fredrik Medley | 2015-05-21 | |
| | |/ / / / / / | |/| | | | | | | ||||
* | | | | | | | | Merge branch 'pt/pull-ff-vs-merge-ff' | Junio C Hamano | 2015-05-26 | |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | ||||
| * | | | | | | | pull: make pull.ff=true override merge.ff | Paul Tan | 2015-05-18 | |
| |/ / / / / / | ||||
* | | | | | | | Merge branch 'mh/lockfile-retry' | Junio C Hamano | 2015-05-22 | |
|\ \ \ \ \ \ \ | ||||
| * | | | | | | | lock_packed_refs(): allow retries when acquiring the packed-refs lock | Michael Haggerty | 2015-05-14 | |
* | | | | | | | | Merge branch 'jk/asciidoc-markup-fix' | Junio C Hamano | 2015-05-22 | |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | ||||
| * | | | | | | | doc: convert \--option to --option | Jeff King | 2015-05-12 | |
* | | | | | | | | Merge branch 'ls/http-ssl-cipher-list' | Junio C Hamano | 2015-05-22 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||
| * | | | | | | | http: add support for specifying an SSL cipher list | Lars Kellogg-Stedman | 2015-05-08 | |
| |/ / / / / / | ||||
| * | | | | | | Merge branch 'mg/doc-status-color-slot' into maint | Junio C Hamano | 2015-03-23 | |
| |\ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ | Merge branch 'jc/decorate-leaky-separator-color' into maint | Junio C Hamano | 2015-03-23 | |
| |\ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ | Merge branch 'ms/submodule-update-config-doc' into maint | Junio C Hamano | 2015-03-13 | |
| |\ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ | Merge branch 'mm/am-c-doc' into maint | Junio C Hamano | 2015-03-06 | |
| |\ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jc/conf-var-doc' into maint | Junio C Hamano | 2015-03-05 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||
* | \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/multiple-work-trees' | Junio C Hamano | 2015-05-11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | / / / | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | ||||
| * | | | | | | | | | | gc: support prune --worktrees | Nguyễn Thái Ngọc Duy | 2014-12-01 | |
| * | | | | | | | | | | setup.c: support multi-checkout repo setup | Nguyễn Thái Ngọc Duy | 2014-12-01 | |
* | | | | | | | | | | | Merge branch 'jk/push-config' | Junio C Hamano | 2015-03-23 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | push: allow --follow-tags to be set by config push.followTags | Dave Olszewski | 2015-03-14 | |
* | | | | | | | | | | | | Merge branch 'nd/config-doc-camelCase' | Junio C Hamano | 2015-03-23 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | ||||
| * | | | | | | | | | | | *config.txt: stick to camelCase naming convention | Nguyễn Thái Ngọc Duy | 2015-03-13 | |
* | | | | | | | | | | | | Merge branch 'jc/decorate-leaky-separator-color' | Junio C Hamano | 2015-03-20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | ||||
| * | | | | | | | | | | | log --decorate: do not leak "commit" color into the next item | Junio C Hamano | 2015-03-04 | |
| * | | | | | | | | | | | Documentation/config.txt: simplify boolean description in the syntax section | Junio C Hamano | 2015-03-04 | |
| * | | | | | | | | | | | Documentation/config.txt: describe 'color' value type in the "Values" section | Junio C Hamano | 2015-03-04 | |
| * | | | | | | | | | | | Documentation/config.txt: have a separate "Values" section | Junio C Hamano | 2015-03-04 | |
| * | | | | | | | | | | | Documentation/config.txt: describe the structure first and then meaning | Junio C Hamano | 2015-03-04 | |
| * | | | | | | | | | | | Documentation/config.txt: explain multi-valued variables once | Junio C Hamano | 2015-03-04 | |
| * | | | | | | | | | | | Documentation/config.txt: avoid unnecessary negation | Junio C Hamano | 2015-03-04 | |
* | | | | | | | | | | | | Merge branch 'nd/versioncmp-prereleases' | Junio C Hamano | 2015-03-20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ |