summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | | | | | | | t6022: Additional tests checking for unnecessary updates of filesElijah Newren2011-08-141-0/+91
| * | | | | | | | | | | | merge-recursive: Fix spurious 'refusing to lose untracked file...' messagesElijah Newren2011-08-141-1/+1
| * | | | | | | | | | | | t6022: Add testcase for spurious "refusing to lose untracked" messagesElijah Newren2011-08-141-0/+26
| * | | | | | | | | | | | t3030: fix accidental success in symlink renameJeff King2011-08-141-2/+5
| * | | | | | | | | | | | merge-recursive: Fix working copy handling for rename/rename/add/addElijah Newren2011-08-141-1/+10
| * | | | | | | | | | | | merge-recursive: add handling for rename/rename/add-dest/add-destElijah Newren2011-08-141-1/+1
| * | | | | | | | | | | | merge-recursive: Make modify/delete handling code reusableElijah Newren2011-08-141-2/+2
| * | | | | | | | | | | | merge-recursive: Consider modifications in rename/rename(2to1) conflictsElijah Newren2011-08-142-29/+11
| * | | | | | | | | | | | merge-recursive: Fix rename/rename(1to2) resolution for virtual merge baseElijah Newren2011-08-141-1/+1
| * | | | | | | | | | | | merge-recursive: Fix modify/delete resolution in the recursive caseElijah Newren2011-08-141-2/+2
| * | | | | | | | | | | | merge-recursive: When we detect we can skip an update, actually skip itElijah Newren2011-08-141-2/+2
| * | | | | | | | | | | | merge-recursive: Provide more info in conflict markers with file renamesElijah Newren2011-08-142-5/+72
| * | | | | | | | | | | | merge-recursive: Improve handling of rename target vs. directory additionElijah Newren2011-08-142-3/+3
| * | | | | | | | | | | | merge-recursive: Make dead code for rename/rename(2to1) conflicts undeadElijah Newren2011-08-141-8/+9
| * | | | | | | | | | | | merge-recursive: Fix deletion of untracked file in rename/delete conflictsElijah Newren2011-08-141-1/+1
| * | | | | | | | | | | | merge-recursive: Allow make_room_for_path() to remove D/F entriesElijah Newren2011-08-141-1/+1
| * | | | | | | | | | | | merge-recursive: Fix sorting order and directory change assumptionsElijah Newren2011-08-141-8/+18
View Lorry Controller Status