Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ls/p4-path-encoding' | Junio C Hamano | 2017-02-16 | 1 | -0/+16 |
|\ | |||||
| * | git-p4: fix git-p4.pathEncoding for removed filesls/p4-path-encoding | Lars Schneider | 2017-02-10 | 1 | -0/+16 |
* | | Merge branch 'sb/push-options-via-transport' | Junio C Hamano | 2017-02-15 | 1 | -0/+15 |
|\ \ | |||||
| * | | push options: pass push options to the transport helper | Stefan Beller | 2017-02-08 | 1 | -0/+15 |
* | | | Merge branch 'jk/log-graph-name-only' | Junio C Hamano | 2017-02-10 | 1 | -0/+48 |
|\ \ \ | |||||
| * | | | diff: print line prefix for --name-only outputjk/log-graph-name-only | Jeff King | 2017-02-08 | 1 | -0/+48 |
* | | | | Merge branch 'da/t7800-cleanup' | Junio C Hamano | 2017-02-10 | 1 | -12/+19 |
|\ \ \ \ | |||||
| * | | | | t7800: replace "wc -l" with test_line_countda/t7800-cleanup | David Aguilar | 2017-02-08 | 1 | -12/+19 |
| * | | | | Merge branch 'da/difftool-dir-diff-fix' into da/t7800-cleanup | Junio C Hamano | 2017-02-08 | 1 | -3/+41 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'js/difftool-builtin' | Junio C Hamano | 2017-02-10 | 1 | -0/+12 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | t7800: simplify basic usage test | David Aguilar | 2017-02-08 | 1 | -8/+7 |
| * | | | | | difftool: fix bug when printing usage | David Aguilar | 2017-02-06 | 1 | -0/+13 |
* | | | | | | Merge branch 'rs/p5302-create-repositories-before-tests' | Junio C Hamano | 2017-02-10 | 1 | -0/+7 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | p5302: create repositories for index-pack results explicitlyrs/p5302-create-repositories-before-tests | René Scharfe | 2017-02-06 | 1 | -0/+7 |
* | | | | | | Merge branch 'cw/log-updates-for-all-refs-really' | Junio C Hamano | 2017-02-03 | 2 | -7/+81 |
|\ \ \ \ \ \ | |||||
| * | | | | | | update-ref: add test cases for bare repository | Cornelius Weig | 2017-01-31 | 1 | -7/+36 |
| * | | | | | | refs: add option core.logAllRefUpdates = always | Cornelius Weig | 2017-01-31 | 2 | -0/+45 |
* | | | | | | | Merge branch 'js/re-running-failed-tests' | Junio C Hamano | 2017-02-03 | 1 | -0/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t/Makefile: add a rule to re-run previously-failed testsjs/re-running-failed-tests | Johannes Schindelin | 2017-01-27 | 1 | -0/+6 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'sb/submodule-update-initial-runs-custom-script' | Junio C Hamano | 2017-02-03 | 1 | -0/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | submodule update: run custom update script for initial populating as well | Stefan Beller | 2017-01-26 | 1 | -0/+12 |
* | | | | | | | | Merge branch 'sb/submodule-recursive-absorb' | Junio C Hamano | 2017-02-03 | 1 | -0/+27 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | submodule absorbing: fix worktree/gitdir pointers recursively for non-movessb/submodule-recursive-absorb | Stefan Beller | 2017-01-26 | 1 | -0/+27 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'sb/unpack-trees-super-prefix' | Junio C Hamano | 2017-02-03 | 2 | -654/+643 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | unpack-trees: support super-prefix optionsb/unpack-trees-super-prefix | Stefan Beller | 2017-01-25 | 1 | -0/+8 |
| * | | | | | | | | t1001: modernize style | Stefan Beller | 2017-01-11 | 1 | -321/+320 |
| * | | | | | | | | t1000: modernize style | Stefan Beller | 2017-01-11 | 1 | -333/+315 |
* | | | | | | | | | Merge branch 'nd/log-graph-configurable-colors' | Junio C Hamano | 2017-02-02 | 3 | -1/+42 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | color_parse_mem: allow empty color spec | Jeff King | 2017-01-31 | 3 | -2/+21 |
| * | | | | | | | | | log --graph: customize the graph lines with config log.graphColors | Nguyễn Thái Ngọc Duy | 2017-01-23 | 1 | -0/+22 |
* | | | | | | | | | | Merge branch 'mm/reset-facl-before-umask-test' | Junio C Hamano | 2017-02-02 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t0001: don't let a default ACL interfere with the umask testmm/reset-facl-before-umask-test | Matt McCutchen | 2017-01-30 | 1 | -0/+3 |
* | | | | | | | | | | | Merge branch 'js/unzip-in-usr-bin-workaround' | Junio C Hamano | 2017-02-02 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | test-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/js/unzip-in-usr-bin-workaround | Johannes Schindelin | 2017-01-27 | 1 | -1/+3 |
* | | | | | | | | | | | | Merge branch 'js/status-pre-rebase-i' | Junio C Hamano | 2017-02-02 | 1 | -0/+19 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | status: be prepared for not-yet-started interactive rebasejs/status-pre-rebase-i | Johannes Schindelin | 2017-01-26 | 1 | -0/+19 |
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'sb/submodule-add-force' | Junio C Hamano | 2017-02-02 | 1 | -0/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | submodule add: extend force flag to add existing repossb/submodule-add-force | Stefan Beller | 2016-11-29 | 1 | -0/+14 |
* | | | | | | | | | | | | | Merge branch 'jk/fsck-connectivity-check-fix' | Junio C Hamano | 2017-01-31 | 1 | -3/+73 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | t1450: use "mv -f" within loose object directory | Jeff King | 2017-01-25 | 1 | -1/+1 |
| * | | | | | | | | | | | | | fsck: do not fallback "git fsck <bogus>" to "git fsck" | Jeff King | 2017-01-17 | 1 | -0/+11 |
| * | | | | | | | | | | | | | fsck: tighten error-checks of "git fsck <head>" | Jeff King | 2017-01-17 | 1 | -0/+5 |
| * | | | | | | | | | | | | | fsck: prepare dummy objects for --connectivity-check | Jeff King | 2017-01-17 | 1 | -2/+27 |
| * | | | | | | | | | | | | | fsck: report trees as dangling | Jeff King | 2017-01-17 | 1 | -0/+27 |
| * | | | | | | | | | | | | | t1450: clean up sub-objects in duplicate-entry test | Jeff King | 2017-01-17 | 1 | -1/+3 |
* | | | | | | | | | | | | | | Merge branch 'js/difftool-builtin' | Junio C Hamano | 2017-01-31 | 1 | -46/+46 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | difftool: retire the scripted version | Johannes Schindelin | 2017-01-19 | 1 | -48/+46 |
| * | | | | | | | | | | | | | difftool: add a skeleton for the upcoming builtin | Johannes Schindelin | 2017-01-17 | 1 | -0/+2 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch 'rs/qsort-s' | Junio C Hamano | 2017-01-31 | 2 | -0/+51 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | perf: add basic sort performance test | René Scharfe | 2017-01-23 | 2 | -0/+51 |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | |