summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* t5400: avoid concurrent writes into a trace filejk/alternate-ref-optimJeff King2017-05-181-1/+4
* receive-pack: avoid duplicates between our refs and alternatesJeff King2017-02-081-0/+38
* 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
| | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'ls/filter-process' into maintJunio C Hamano2017-01-172-26/+15
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'sb/t3600-cleanup' into maintJunio C Hamano2017-01-171-73/+51
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'sb/unpack-trees-grammofix' into maintJunio C Hamano2017-01-171-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/t0021-fixup' into maintJunio C Hamano2017-01-171-3/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ak/lazy-prereq-mktemp' into maintJunio C Hamano2017-01-171-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dt/smart-http-detect-server-going-away' into maintJunio C Hamano2017-01-171-0/+52
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gv/p4-multi-path-commit-fix' into maintJunio C Hamano2017-01-171-1/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ld/p4-compare-dir-vs-symlink' into maintJunio C Hamano2017-01-171-0/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/push-default-explicit' into maintJunio C Hamano2017-01-171-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/index-pack-wo-repo-from-stdin' into maintJunio C Hamano2017-01-176-43/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/quote-env-path-list-component' into maintJunio C Hamano2017-01-172-0/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/sequencer-abort-safety' into maintJunio C Hamano2017-01-171-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \