summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ls/p4-path-encoding'Junio C Hamano2017-02-161-0/+16
|\
| * git-p4: fix git-p4.pathEncoding for removed filesls/p4-path-encodingLars Schneider2017-02-101-0/+16
* | Merge branch 'sb/push-options-via-transport'Junio C Hamano2017-02-151-0/+15
|\ \
| * | push options: pass push options to the transport helperStefan Beller2017-02-081-0/+15
* | | Merge branch 'jk/log-graph-name-only'Junio C Hamano2017-02-101-0/+48
|\ \ \
| * | | diff: print line prefix for --name-only outputjk/log-graph-name-onlyJeff King2017-02-081-0/+48
* | | | Merge branch 'da/t7800-cleanup'Junio C Hamano2017-02-101-12/+19
|\ \ \ \
| * | | | t7800: replace "wc -l" with test_line_countda/t7800-cleanupDavid Aguilar2017-02-081-12/+19
| * | | | Merge branch 'da/difftool-dir-diff-fix' into da/t7800-cleanupJunio C Hamano2017-02-081-3/+41
| |\ \ \ \
* | \ \ \ \ Merge branch 'js/difftool-builtin'Junio C Hamano2017-02-101-0/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | t7800: simplify basic usage testDavid Aguilar2017-02-081-8/+7
| * | | | | difftool: fix bug when printing usageDavid Aguilar2017-02-061-0/+13
* | | | | | Merge branch 'rs/p5302-create-repositories-before-tests'Junio C Hamano2017-02-101-0/+7
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | p5302: create repositories for index-pack results explicitlyrs/p5302-create-repositories-before-testsRené Scharfe2017-02-061-0/+7
* | | | | | Merge branch 'cw/log-updates-for-all-refs-really'Junio C Hamano2017-02-032-7/+81
|\ \ \ \ \ \
| * | | | | | update-ref: add test cases for bare repositoryCornelius Weig2017-01-311-7/+36
| * | | | | | refs: add option core.logAllRefUpdates = alwaysCornelius Weig2017-01-312-0/+45
* | | | | | | Merge branch 'js/re-running-failed-tests'Junio C Hamano2017-02-031-0/+6
|\ \ \ \ \ \ \
| * | | | | | | t/Makefile: add a rule to re-run previously-failed testsjs/re-running-failed-testsJohannes Schindelin2017-01-271-0/+6
| |/ / / / / /
* | | | | | | Merge branch 'sb/submodule-update-initial-runs-custom-script'Junio C Hamano2017-02-031-0/+12
|\ \ \ \ \ \ \
| * | | | | | | submodule update: run custom update script for initial populating as wellStefan Beller2017-01-261-0/+12
* | | | | | | | Merge branch 'sb/submodule-recursive-absorb'Junio C Hamano2017-02-031-0/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | submodule absorbing: fix worktree/gitdir pointers recursively for non-movessb/submodule-recursive-absorbStefan Beller2017-01-261-0/+27
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'sb/unpack-trees-super-prefix'Junio C Hamano2017-02-032-654/+643
|\ \ \ \ \ \ \ \
| * | | | | | | | unpack-trees: support super-prefix optionsb/unpack-trees-super-prefixStefan Beller2017-01-251-0/+8
| * | | | | | | | t1001: modernize styleStefan Beller2017-01-111-321/+320
| * | | | | | | | t1000: modernize styleStefan Beller2017-01-111-333/+315
* | | | | | | | | Merge branch 'nd/log-graph-configurable-colors'Junio C Hamano2017-02-023-1/+42
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | color_parse_mem: allow empty color specJeff King2017-01-313-2/+21
| * | | | | | | | | log --graph: customize the graph lines with config log.graphColorsNguyễn Thái Ngọc Duy2017-01-231-0/+22
* | | | | | | | | | Merge branch 'mm/reset-facl-before-umask-test'Junio C Hamano2017-02-021-0/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t0001: don't let a default ACL interfere with the umask testmm/reset-facl-before-umask-testMatt McCutchen2017-01-301-0/+3
* | | | | | | | | | | Merge branch 'js/unzip-in-usr-bin-workaround'Junio C Hamano2017-02-021-1/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | test-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/js/unzip-in-usr-bin-workaroundJohannes Schindelin2017-01-271-1/+3
* | | | | | | | | | | | Merge branch 'js/status-pre-rebase-i'Junio C Hamano2017-02-021-0/+19
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | status: be prepared for not-yet-started interactive rebasejs/status-pre-rebase-iJohannes Schindelin2017-01-261-0/+19
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'sb/submodule-add-force'Junio C Hamano2017-02-021-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | submodule add: extend force flag to add existing repossb/submodule-add-forceStefan Beller2016-11-291-0/+14
* | | | | | | | | | | | | Merge branch 'jk/fsck-connectivity-check-fix'Junio C Hamano2017-01-311-3/+73
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t1450: use "mv -f" within loose object directoryJeff King2017-01-251-1/+1
| * | | | | | | | | | | | | fsck: do not fallback "git fsck <bogus>" to "git fsck"Jeff King2017-01-171-0/+11
| * | | | | | | | | | | | | fsck: tighten error-checks of "git fsck <head>"Jeff King2017-01-171-0/+5
| * | | | | | | | | | | | | fsck: prepare dummy objects for --connectivity-checkJeff King2017-01-171-2/+27
| * | | | | | | | | | | | | fsck: report trees as danglingJeff King2017-01-171-0/+27
| * | | | | | | | | | | | | t1450: clean up sub-objects in duplicate-entry testJeff King2017-01-171-1/+3
* | | | | | | | | | | | | | Merge branch 'js/difftool-builtin'Junio C Hamano2017-01-311-46/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | difftool: retire the scripted versionJohannes Schindelin2017-01-191-48/+46
| * | | | | | | | | | | | | difftool: add a skeleton for the upcoming builtinJohannes Schindelin2017-01-171-0/+2
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'rs/qsort-s'Junio C Hamano2017-01-312-0/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | perf: add basic sort performance testRené Scharfe2017-01-232-0/+51
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |