Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'ls/p4-path-encoding' | Junio C Hamano | 2017-02-16 |
|\ | |||
| * | git-p4: fix git-p4.pathEncoding for removed files | Lars Schneider | 2017-02-10 |
* | | Merge branch 'sb/push-options-via-transport' | Junio C Hamano | 2017-02-15 |
|\ \ | |||
| * | | push options: pass push options to the transport helper | Stefan Beller | 2017-02-08 |
* | | | Merge branch 'jk/log-graph-name-only' | Junio C Hamano | 2017-02-10 |
|\ \ \ | |||
| * | | | diff: print line prefix for --name-only output | Jeff King | 2017-02-08 |
* | | | | Merge branch 'da/t7800-cleanup' | Junio C Hamano | 2017-02-10 |
|\ \ \ \ | |||
| * | | | | t7800: replace "wc -l" with test_line_count | David Aguilar | 2017-02-08 |
| * | | | | Merge branch 'da/difftool-dir-diff-fix' into da/t7800-cleanup | Junio C Hamano | 2017-02-08 |
| |\ \ \ \ | |||
* | \ \ \ \ | 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 'cw/log-updates-for-all-refs-really' | Junio C Hamano | 2017-02-03 |
|\ \ \ \ \ \ | |||
| * | | | | | | update-ref: add test cases for bare repository | Cornelius Weig | 2017-01-31 |
| * | | | | | | refs: add option core.logAllRefUpdates = always | Cornelius Weig | 2017-01-31 |
* | | | | | | | 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 |
| | |/ / / / / / | |/| | | | | | | |||
* | | | | | | | | 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 |
* | | | | | | | | | Merge branch 'nd/log-graph-configurable-colors' | Junio C Hamano | 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 |
* | | | | | | | | | | Merge branch 'mm/reset-facl-before-umask-test' | Junio C Hamano | 2017-02-02 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | t0001: don't let a default ACL interfere with the umask test | Matt McCutchen | 2017-01-30 |
* | | | | | | | | | | | Merge branch 'js/unzip-in-usr-bin-workaround' | Junio C Hamano | 2017-02-02 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | test-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/ | Johannes Schindelin | 2017-01-27 |
* | | | | | | | | | | | | Merge branch 'js/status-pre-rebase-i' | Junio C Hamano | 2017-02-02 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | status: be prepared for not-yet-started interactive rebase | Johannes Schindelin | 2017-01-26 |
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | Merge branch 'sb/submodule-add-force' | Junio C Hamano | 2017-02-02 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | submodule add: extend force flag to add existing repos | Stefan Beller | 2016-11-29 |
* | | | | | | | | | | | | | Merge branch 'jk/fsck-connectivity-check-fix' | Junio C Hamano | 2017-01-31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | t1450: use "mv -f" within loose object directory | Jeff King | 2017-01-25 |
| * | | | | | | | | | | | | | fsck: do not fallback "git fsck <bogus>" to "git fsck" | Jeff King | 2017-01-17 |
| * | | | | | | | | | | | | | fsck: tighten error-checks of "git fsck <head>" | Jeff King | 2017-01-17 |
| * | | | | | | | | | | | | | fsck: prepare dummy objects for --connectivity-check | Jeff King | 2017-01-17 |
| * | | | | | | | | | | | | | fsck: report trees as dangling | Jeff King | 2017-01-17 |
| * | | | | | | | | | | | | | t1450: clean up sub-objects in duplicate-entry test | Jeff King | 2017-01-17 |
* | | | | | | | | | | | | | | Merge branch 'js/difftool-builtin' | Junio C Hamano | 2017-01-31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | difftool: retire the scripted version | Johannes Schindelin | 2017-01-19 |
| * | | | | | | | | | | | | | difftool: add a skeleton for the upcoming builtin | Johannes Schindelin | 2017-01-17 |
| |/ / / / / / / / / / / / | |||
* | | | | | | | | | | | | | Merge branch 'rs/qsort-s' | Junio C Hamano | 2017-01-31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | perf: add basic sort performance test | René Scharfe | 2017-01-23 |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | |