summaryrefslogtreecommitdiff
path: root/t/t1002-read-tree-m-u-2way.sh
Commit message (Expand)AuthorAgeFilesLines
* t: use test_might_fail for diff and grepJeff King2015-03-201-4/+4
* t1002-read-tree-m-u-2way.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-291-5/+5
* Teach read-tree the -n|--dry-run optionJens Lehmann2011-05-251-40/+41
* t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing &&Elijah Newren2010-10-061-5/+5
* tests: move convenience regexp to match object names to test-lib.shJunio C Hamano2010-01-031-2/+0
* t1002-read-tree-m-u-2way.sh: use 'git diff -U0' rather than 'diff -U0'Brandon Casey2008-08-181-4/+6
* t/: Replace diff [-u|-U0] with test_cmp to allow compilation with old diffBrandon Casey2008-07-231-6/+6
* tests: do not use implicit "git diff --no-index"Junio C Hamano2008-05-241-1/+1
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-021-87/+87
* Get rid of the dependency to GNU diff in the testsJohannes Schindelin2007-03-041-1/+1
* t1002: use -U0 instead of --unified=0Linus Torvalds2006-05-281-10/+10
* read-tree -m -u: do not overwrite or remove untracked working tree files.Junio C Hamano2006-05-171-23/+43
* Libify diff-files.Junio C Hamano2006-04-221-1/+1
* Big tool rename.Junio C Hamano2005-09-071-23/+23
* [PATCH] Trapping exit in tests, using return for errorsPavel Roskin2005-08-111-4/+4
* [PATCH] replace sha1sum with sum in t/t1002Mark Allen2005-06-271-15/+32
* [PATCH] Tests: read-tree -m test updates.Junio C Hamano2005-06-081-2/+2
* [PATCH] read-tree: save more user hassles during fast-forward.Junio C Hamano2005-06-071-0/+307