Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'js/difftool-builtin' | Junio C Hamano | 2017-02-10 |
|\ | |||
| * | t7800: simplify basic usage test | David Aguilar | 2017-02-08 |
| * | difftool: fix bug when printing usage | David Aguilar | 2017-02-06 |
* | | Merge branch 'rs/p5302-create-repositories-before-tests' | Junio C Hamano | 2017-02-10 |
|\ \ | |||
| * | | p5302: create repositories for index-pack results explicitly | René Scharfe | 2017-02-06 |
* | | | Merge branch 'ps/worktree-prune-help-fix' | Junio C Hamano | 2017-02-10 |
|\ \ \ | |||
| * | | | worktree: fix option descriptions for `prune` | Patrick Steinhardt | 2017-02-06 |
* | | | | Merge branch 'ew/complete-svn-authorship-options' | Junio C Hamano | 2017-02-10 |
|\ \ \ \ | |||
| * | | | | completion: fix git svn authorship switches | Eric Wong | 2017-02-06 |
* | | | | | Merge branch 'jk/reset-to-break-a-commit-doc' | Junio C Hamano | 2017-02-10 |
|\ \ \ \ \ | |||
| * | | | | | reset: add an example of how to split a commit into two | Jacob Keller | 2017-02-03 |
* | | | | | | Merge branch 'bw/push-submodule-only' | Junio C Hamano | 2017-02-10 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||
| * | | | | | completion: add completion for --recurse-submodules=only | Cornelius Weig | 2017-02-01 |
| * | | | | | doc: add doc for git-push --recurse-submodules=only | Cornelius Weig | 2017-02-01 |
* | | | | | | Git 2.12-rc0v2.12.0-rc0 | Junio C Hamano | 2017-02-03 |
* | | | | | | Merge branch 'cw/log-updates-for-all-refs-really' | Junio C Hamano | 2017-02-03 |
|\ \ \ \ \ \ | |||
| * | | | | | | doc: add note about ignoring '--no-create-reflog' | Cornelius Weig | 2017-02-01 |
| * | | | | | | update-ref: add test cases for bare repository | Cornelius Weig | 2017-01-31 |
| * | | | | | | refs: add option core.logAllRefUpdates = always | Cornelius Weig | 2017-01-31 |
| * | | | | | | config: add markup to core.logAllRefUpdates doc | Cornelius Weig | 2017-01-30 |
* | | | | | | | Merge branch 'pl/complete-diff-submodule-diff' | Junio C Hamano | 2017-02-03 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | Completion: Add support for --submodule=diff | Peter Law | 2017-01-30 |
| |/ / / / / / | |||
* | | | | | | | Merge branch 'rs/object-id' | Junio C Hamano | 2017-02-03 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | checkout: convert post_checkout_hook() to struct object_id | René Scharfe | 2017-01-30 |
| * | | | | | | | use oidcpy() for copying hashes between instances of struct object_id | René Scharfe | 2017-01-30 |
| * | | | | | | | use oid_to_hex_r() for converting struct object_id hashes to hex strings | René Scharfe | 2017-01-30 |
| |/ / / / / / | |||
* | | | | | | | Merge branch 'js/re-running-failed-tests' | Junio C Hamano | 2017-02-03 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | t/Makefile: add a rule to re-run previously-failed tests | Johannes Schindelin | 2017-01-27 |
| |/ / / / / / | |||
* | | | | | | | Merge branch 'sb/submodule-update-initial-runs-custom-script' | Junio C Hamano | 2017-02-03 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | submodule update: run custom update script for initial populating as well | Stefan Beller | 2017-01-26 |
* | | | | | | | | Merge branch 'sb/submodule-recursive-absorb' | Junio C Hamano | 2017-02-03 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | submodule absorbing: fix worktree/gitdir pointers recursively for non-moves | Stefan Beller | 2017-01-26 |
| * | | | | | | | | cache.h: expose the dying procedure for reading gitlinks | Stefan Beller | 2017-01-26 |
| * | | | | | | | | setup: add gentle version of resolve_git_dir | Stefan Beller | 2017-01-26 |
| | |/ / / / / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'sb/unpack-trees-super-prefix' | Junio C Hamano | 2017-02-03 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | unpack-trees: support super-prefix option | Stefan Beller | 2017-01-25 |
| * | | | | | | | | t1001: modernize style | Stefan Beller | 2017-01-11 |
| * | | | | | | | | t1000: modernize style | Stefan Beller | 2017-01-11 |
| * | | | | | | | | read-tree: use OPT_BOOL instead of OPT_SET_INT | Stefan Beller | 2017-01-11 |
* | | | | | | | | | Sync with v2.11.1 | Junio C Hamano | 2017-02-02 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||
| * | | | | | | | | Git 2.11.1v2.11.1 | Junio C Hamano | 2017-02-02 |
| * | | | | | | | | Merge branch 'ws/request-pull-code-cleanup' into maint | Junio C Hamano | 2017-02-02 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/execv-dashed-external' into maint | Junio C Hamano | 2017-02-02 |
| |\ \ \ \ \ \ \ \ \ | |||
* | | | | | | | | | | | Ninth batch for 2.12; almost ready for -rc0 | Junio C Hamano | 2017-02-02 |
* | | | | | | | | | | | Merge branch 'nd/log-graph-configurable-colors' | Junio C Hamano | 2017-02-02 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | document behavior of empty color name | Jeff King | 2017-02-02 |
| * | | | | | | | | | | | color_parse_mem: allow empty color spec | Jeff King | 2017-01-31 |
| * | | | | | | | | | | | log --graph: customize the graph lines with config log.graphColors | Nguyễn Thái Ngọc Duy | 2017-01-23 |
| * | | | | | | | | | | | color.c: trim leading spaces in color_parse_mem() | Nguyễn Thái Ngọc Duy | 2017-01-19 |
| * | | | | | | | | | | | color.c: fix color_parse_mem() with value_len == 0 | Nguyễn Thái Ngọc Duy | 2017-01-19 |