summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ew/git-svn-http-tests'Junio C Hamano2016-08-0810-91/+30
|\
| * git svn: migrate tests to use lib-httpdew/git-svn-http-testsEric Wong2016-07-257-86/+30
| * t/t91*: do not say how to avoid the testsMichael J Gruber2016-07-253-5/+0
* | Merge branch 'js/t4130-rename-without-ino'Junio C Hamano2016-08-081-3/+7
|\ \
| * | t4130: work around Windows limitationjs/t4130-rename-without-inoJohannes Sixt2016-08-031-3/+7
* | | Merge branch 'jc/grep-commandline-vs-configuration'Junio C Hamano2016-08-041-0/+14
|\ \ \
| * | | grep: further simplify setting the pattern typejc/grep-commandline-vs-configurationJunio C Hamano2016-07-251-0/+14
* | | | Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning'Junio C Hamano2016-08-031-0/+11
|\ \ \ \
| * | | | diff: do not reuse worktree files that need "clean" conversionjk/diff-do-not-reuse-wtf-needs-cleaningJeff King2016-07-221-0/+11
| | |_|/ | |/| |
* | | | Merge branch 'rs/submodule-config-code-cleanup'Junio C Hamano2016-08-032-1/+12
|\ \ \ \
| * | | | submodule-config: passing name reference for .gitmodule blobsHeiko Voigt2016-07-281-0/+11
| |/ / /
* | | | Merge branch 'mm/status-suggest-merge-abort'Junio C Hamano2016-08-032-0/+5
|\ \ \ \
| * | | | status: suggest 'git merge --abort' when appropriatemm/status-suggest-merge-abortMatthieu Moy2016-07-222-0/+5
| | |_|/ | |/| |
* | | | Merge branch 'sb/push-options'Junio C Hamano2016-08-031-0/+103
|\ \ \ \
| * | | | add a test for push optionssb/push-optionsStefan Beller2016-07-141-0/+103
* | | | | t9100: portability fixJunio C Hamano2016-07-281-2/+4
* | | | | Merge branch 'master' of git://git.bogomips.org/git-svnJunio C Hamano2016-07-281-0/+19
|\ \ \ \ \
| * | | | | git-svn: allow --version to work anywhereEric Wong2016-07-221-0/+19
* | | | | | Merge branch 'nd/pack-ofs-4gb-limit'Junio C Hamano2016-07-281-4/+3
|\ \ \ \ \ \
| * | | | | | fsck: use streaming interface for large blobs in packnd/pack-ofs-4gb-limitNguyễn Thái Ngọc Duy2016-07-131-4/+3
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'nd/worktree-lock'Junio C Hamano2016-07-281-0/+62
|\ \ \ \ \ \
| * | | | | | worktree: add "unlock" commandNguyễn Thái Ngọc Duy2016-07-081-0/+14
| * | | | | | worktree: add "lock" commandNguyễn Thái Ngọc Duy2016-07-081-0/+48
* | | | | | | Merge branch 'js/rebase-i-tests'Junio C Hamano2016-07-282-0/+41
|\ \ \ \ \ \ \
| * | | | | | | rebase -i: we allow extra spaces after fixup!/squash!js/rebase-i-testsJohannes Schindelin2016-07-071-0/+9
| * | | | | | | rebase -i: demonstrate a bug with --autosquashJohannes Schindelin2016-07-071-0/+24
| * | | | | | | t3404: add a test for the --gpg-sign optionJohannes Schindelin2016-07-071-0/+8
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'mh/blame-worktree'Junio C Hamano2016-07-251-17/+62
|\ \ \ \ \ \ \
| * | | | | | | t/t8003-blame-corner-cases.sh: Use here documentsMike Hommey2016-07-181-17/+17
| * | | | | | | blame: allow to blame paths freshly added to the indexMike Hommey2016-07-181-0/+45
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'js/fsck-name-object'Junio C Hamano2016-07-251-0/+22
|\ \ \ \ \ \ \
| * | | | | | | fsck: optionally show more helpful info for broken linksJohannes Schindelin2016-07-181-0/+22
* | | | | | | | Merge branch 'nd/cache-tree-ita'Junio C Hamano2016-07-2514-50/+76
|\ \ \ \ \ \ \ \
| * | | | | | | | cache-tree: do not generate empty trees as a result of all i-t-a subentriesnd/cache-tree-itaNguyễn Thái Ngọc Duy2016-07-181-0/+14
| * | | | | | | | cache-tree.c: fix i-t-a entry skipping directory updates sometimesNguyễn Thái Ngọc Duy2016-07-181-0/+17
| * | | | | | | | test-lib.sh: introduce and use $EMPTY_BLOBNguyễn Thái Ngọc Duy2016-07-188-38/+35
| * | | | | | | | test-lib.sh: introduce and use $EMPTY_TREENguyễn Thái Ngọc Duy2016-07-186-13/+11
* | | | | | | | | Merge branch 'jk/push-scrub-url'Junio C Hamano2016-07-251-0/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t5541: fix url scrubbing test when GPG is not setjk/push-scrub-urlJeff King2016-07-201-2/+4
| * | | | | | | | | push: anonymize URL in status outputJeff King2016-07-141-0/+7
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'nd/test-helpers'Junio C Hamano2016-07-251-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t/test-lib.sh: fix running tests with --valgrindJohannes Schindelin2016-07-111-1/+1
* | | | | | | | | | Merge branch 'jc/renormalize-merge-kill-safer-crlf'Junio C Hamano2016-07-253-48/+59
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | merge: avoid "safer crlf" during recording of merge resultsJunio C Hamano2016-07-121-23/+28
| * | | | | | | | | | convert: unify the "auto" handling of CRLFTorsten Bögershausen2016-07-063-25/+31
* | | | | | | | | | | Merge branch 'js/ignore-space-at-eol'Junio C Hamano2016-07-251-0/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | diff: fix a double off-by-one with --ignore-space-at-eoljs/ignore-space-at-eolJohannes Schindelin2016-07-111-1/+1
| * | | | | | | | | | | diff: demonstrate a bug with --patience and --ignore-space-at-eolJohannes Schindelin2016-07-111-0/+8
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'mh/update-ref-errors'Junio C Hamano2016-07-252-181/+407
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | lock_ref_for_update(): make error handling more uniformMichael Haggerty2016-06-201-7/+7
View Lorry Controller Status