Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'hv/submodule-config' | Junio C Hamano | 2015-08-31 |
|\ | |||
| * | submodule: use new config API for worktree configurations | Heiko Voigt | 2015-08-19 |
| * | submodule: implement a config API for lookup of .gitmodules values | Heiko Voigt | 2015-08-19 |
* | | Merge branch 'sg/config-name-only' | Junio C Hamano | 2015-08-31 |
|\ \ | |||
| * | | config: add '--name-only' option to list only variable names | SZEDER Gábor | 2015-08-10 |
* | | | Sync with 2.5.1 | Junio C Hamano | 2015-08-28 |
|\ \ \ | |||
| * | | | Git 2.5.1v2.5.1 | Junio C Hamano | 2015-08-28 |
* | | | | Seventh batch for 2.6 | Junio C Hamano | 2015-08-28 |
* | | | | Sixth batch for 2.6 | Junio C Hamano | 2015-08-26 |
* | | | | 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 'jv/send-email-selective-smtp-auth' | Junio C Hamano | 2015-08-26 |
|\ \ \ \ \ | |||
| * | | | | | send-email: provide whitelist of SMTP AUTH mechanisms | Jan Viktorin | 2015-08-17 |
* | | | | | | 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 |
| |/ / / / / | |||
* | | | | | | Fifth batch for 2.6 | Junio C Hamano | 2015-08-25 |
* | | | | | | Merge branch 'mh/tempfile' | Junio C Hamano | 2015-08-25 |
|\ \ \ \ \ \ | |||
| * | | | | | | lockfile: move documentation to lockfile.h and lockfile.c | Michael Haggerty | 2015-08-10 |
* | | | | | | | Merge branch 'dt/refs-pseudo' | Junio C Hamano | 2015-08-25 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | refs: introduce pseudoref and per-worktree ref concepts | David Turner | 2015-07-31 |
* | | | | | | | | Sync with maint | Junio C Hamano | 2015-08-19 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||
| * | | | | | | | Start preparing for 2.5.1 | Junio C Hamano | 2015-08-19 |
| * | | | | | | | Merge branch 'ta/docfix-index-format-tech' into maint | Junio C Hamano | 2015-08-19 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'kn/tag-doc-fix' into maint | Junio C Hamano | 2015-08-19 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'es/doc-clean-outdated-tools' into maint | Junio C Hamano | 2015-08-19 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'ib/scripted-parse-opt-better-hint-string' into maint | Junio C Hamano | 2015-08-19 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'se/doc-checkout-ours-theirs' into maint | Junio C Hamano | 2015-08-19 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
* | | | | | | | | | | | | | Fourth batch for 2.6 | Junio C Hamano | 2015-08-19 |
* | | | | | | | | | | | | | 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 |
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |||
* | | | | | | | | | | | | | Third batch for 2.6 | Junio C Hamano | 2015-08-17 |
* | | | | | | | | | | | | | Merge branch 'ta/docfix-index-format-tech' | Junio C Hamano | 2015-08-17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |||
| * | | | | | | | | | | | | typofix for index-format.txt | Thomas Ackermann | 2015-07-28 |
* | | | | | | | | | | | | | Second batch for 2.6 | Junio C Hamano | 2015-08-12 |
* | | | | | | | | | | | | | Merge branch 'es/worktree-add-cleanup' | Junio C Hamano | 2015-08-12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | Documentation/git-worktree: fix duplicated 'from' | Patrick Steinhardt | 2015-08-05 |
| * | | | | | | | | | | | | | Documentation/config: mention "now" and "never" for 'expire' settings | Eric Sunshine | 2015-07-28 |
| * | | | | | | | | | | | | | Documentation/git-worktree: fix broken 'linkgit' invocation | Eric Sunshine | 2015-07-24 |
| * | | | | | | | | | | | | | worktree: add: suppress auto-vivication with --detach and no <branch> | Eric Sunshine | 2015-07-20 |
* | | | | | | | | | | | | | | 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 |
| * | | | | | | | | | | | | | | Documentation/git-worktree: fix incorrect reference to file "locked" | Michael Haggerty | 2015-07-20 |
| * | | | | | | | | | | | | | | Documentation/git-worktree: consistently use term "linked working tree" | Michael Haggerty | 2015-07-20 |
* | | | | | | | | | | | | | | | Merge branch 'ad/bisect-cleanup' | Junio C Hamano | 2015-08-12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | Documentation/bisect: revise overall content | Michael Haggerty | 2015-06-26 |