summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | reset: Make reset remove the sequencer stateRamkumar Ramachandra2011-08-081-0/+44
| * | | | | | | | | | | | revert: Introduce --reset to remove sequencer stateRamkumar Ramachandra2011-08-041-1/+13
| * | | | | | | | | | | | revert: Save command-line options for continuing operationRamkumar Ramachandra2011-08-041-2/+27
| * | | | | | | | | | | | revert: Save data for continuing after conflict resolutionRamkumar Ramachandra2011-08-041-0/+48
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'bc/unstash-clean-crufts'Junio C Hamano2011-10-051-14/+34
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git-stash: remove untracked/ignored directories when stashedbc/unstash-clean-cruftsBrandon Casey2011-08-271-3/+23
| * | | | | | | | | | | | t/t3905: add missing '&&' linkageBrandon Casey2011-08-271-3/+3
| * | | | | | | | | | | | t/t3905: use the name 'actual' for test output, swap arguments to test_cmpBrandon Casey2011-08-271-12/+12
* | | | | | | | | | | | | Merge branch 'bk/ancestry-path'Junio C Hamano2011-10-051-0/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t6019: avoid refname collision on case-insensitive systemsThomas Rast2011-09-151-8/+11
| * | | | | | | | | | | | | revision: do not include sibling history in --ancestry-path outputJunio C Hamano2011-08-251-1/+1
| * | | | | | | | | | | | | rev-list: Demonstrate breakage with --ancestry-path --allBrad King2011-08-251-0/+35
* | | | | | | | | | | | | | Merge branch 'tr/mergetool-valgrind'Junio C Hamano2011-10-051-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Symlink mergetools scriptlets into valgrind wrappersThomas Rast2011-08-301-0/+2
* | | | | | | | | | | | | | | Merge branch 'mm/rebase-i-exec-edit'Junio C Hamano2011-10-051-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | rebase -i: clean error message for --continue after failed execMatthieu Moy2011-08-261-0/+14
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'jc/no-gitweb-test-without-cgi-etc' into maintJunio C Hamano2011-08-231-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ph/format-patch-no-color'Junio C Hamano2011-09-191-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | t4014: clean up format.thread config after each testJeff King2011-09-191-4/+4
* | | | | | | | | | | | | | | Merge branch 'ci/forbid-unwanted-current-branch-update'Junio C Hamano2011-09-161-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | branch --set-upstream: regression fixJunio C Hamano2011-09-161-0/+13
* | | | | | | | | | | | | | | | Disambiguate duplicate t9160* testsFrédéric Heitzmann2011-09-162-1/+1
* | | | | | | | | | | | | | | | Merge branch 'ph/format-patch-no-color'Junio C Hamano2011-09-141-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | format-patch: ignore ui.colorPang Yan Han2011-09-121-0/+8
* | | | | | | | | | | | | | | | git-svn: teach git-svn to populate svn:mergeinfoBryan Jacobs2011-09-132-0/+478
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'cb/maint-ls-files-error-report'Junio C Hamano2011-09-061-10/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | t3005: do not assume a particular order of stdout and stderr of git-ls-filesJohannes Sixt2011-08-281-10/+12
* | | | | | | | | | | | | | | | Merge branch 'mh/check-ref-format-print-normalize'Junio C Hamano2011-09-061-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Forbid DEL characters in reference namesMichael Haggerty2011-08-271-0/+3
| * | | | | | | | | | | | | | | | check-ref-format --print: Normalize refnames that start with slashesMichael Haggerty2011-08-251-0/+6
* | | | | | | | | | | | | | | | | Merge branch 'tr/maint-t3903-misquoted-command'Junio C Hamano2011-09-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | t3903: fix misquoted rev-parse invocationThomas Rast2011-08-301-1/+1
* | | | | | | | | | | | | | | | | | Merge branch 'bc/bisect-test-use-shell-path'Junio C Hamano2011-09-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | t6030: use $SHELL_PATH to invoke user's preferred shell instead of bare shBrandon Casey2011-08-301-1/+1
* | | | | | | | | | | | | | | | | | | Merge branch 'va/p4-branch-import-test-update'Junio C Hamano2011-09-021-11/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | git-p4: simple branch tests editsPete Wyckoff2011-08-291-11/+8
* | | | | | | | | | | | | | | | | | | | Merge branch 'tr/maint-format-patch-empty-output'Junio C Hamano2011-09-021-3/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | t4014: "no-add-headers" is actually called "no-add-header"Thomas Rast2011-08-291-2/+2
| * | | | | | | | | | | | | | | | | | | | t4014: invoke format-patch with --stdout where intendedThomas Rast2011-08-291-2/+2
| * | | | | | | | | | | | | | | | | | | | t4014: check for empty files from git format-patch --stdoutThomas Rast2011-08-291-2/+19
* | | | | | | | | | | | | | | | | | | | | Merge branch 'bg/t5540-osx-grep'Junio C Hamano2011-09-021-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | t5540-http-test: shorten grep patternBrian Gernhardt2011-08-281-2/+6
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'fg/submodule-ff-check-before-push'Junio C Hamano2011-09-021-0/+87
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | push: Don't push a repository with unpushed submodulesFredrik Gustafsson2011-08-201-0/+87
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fk/use-kwset-pickaxe-grep-f'Junio C Hamano2011-09-021-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Use kwset in grepFredrik Kuivinen2011-08-201-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'en/merge-recursive-2'Junio C Hamano2011-09-025-46/+1454
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-destElijah Newren2011-08-141-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | t6036: criss-cross + rename/rename(1to2)/add-dest + simple modifyElijah Newren2011-08-141-0/+69
| * | | | | | | | | | | | | | | | | | | | | | | | merge-recursive: Avoid unnecessary file rewritesElijah Newren2011-08-141-3/+3