summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/pull-rebase-ff' into maintJunio C Hamano2017-01-171-0/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ak/commit-only-allow-empty' into maintJunio C Hamano2017-01-171-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'da/difftool-dir-diff-fix' into maintJunio C Hamano2017-01-171-3/+41
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jb/diff-no-index-no-abbrev' into maintJunio C Hamano2017-01-177-0/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/stash-disable-renames-internally' into maintJunio C Hamano2017-01-171-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/http-walker-limit-redirect' into maintJunio C Hamano2017-01-174-0/+80
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maintJunio C Hamano2017-01-171-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/p4-empty-file-on-lfs' into maintJunio C Hamano2017-01-171-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/worktree-list-fixup' into maintJunio C Hamano2017-01-171-0/+40
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bw/push-dry-run' into maintJunio C Hamano2017-01-171-0/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dt/empty-submodule-in-merge' into maintJunio C Hamano2017-01-172-5/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rev-parse-symbolic-parents-fix' into maintJunio C Hamano2017-01-171-0/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'vp/show-ref-verify-head'Junio C Hamano2017-01-311-0/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | show-ref: detect dangling refs under --verify as wellVladimir Panteleev2017-01-231-0/+22
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | show-ref: allow -d to work with --verifyVladimir Panteleev2017-01-231-0/+9
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | show-ref: accept HEAD with --verifyVladimir Panteleev2017-01-231-0/+11
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/remote-rename-with-half-configured-remote'Junio C Hamano2017-01-311-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remote rename: more carefully determine whether a remote is configuredjs/remote-rename-with-half-configured-remoteJohannes Schindelin2017-01-191-1/+1