summaryrefslogtreecommitdiff
path: root/t/t4200-rerere.sh
AgeCommit message (Expand)Author
2010-09-03Merge branch 'jn/merge-renormalize'Junio C Hamano
2010-08-06rerere: migrate to parse-options APIJonathan Nieder
2010-08-06t4200 (rerere): modernize styleJonathan Nieder
2010-07-14rerere: fix overeager gcSZEDER Gábor
2010-03-20Use test_expect_success for test setupsBrian Gernhardt
2009-12-04Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano
2009-05-06t4200: convert sed expression which operates on non-text file to perlBrandon Casey
2009-05-06t4200: remove two unnecessary linesBrandon Casey
2008-07-17Merge branch 'sb/dashless'Junio C Hamano
2008-07-13t/: Use "test_must_fail git" instead of "! git"Stephan Beyer
2008-07-13Move MERGE_RR from .git/rr-cache/ into .git/Johannes Schindelin
2008-07-10builtin-rerere: more carefully find conflict markersOlivier Marin
2008-06-22rerere.autoupdateJunio C Hamano
2008-06-22t4200: fix rerere testJunio C Hamano
2008-05-24tests: do not use implicit "git diff --no-index"Junio C Hamano
2008-03-13more tr portability test script fixesJeff King
2007-12-18the use of 'tr' in the test suite isn't really portableH.Merijn Brand
2007-07-10rerere: record resolution even if file is not in merge baseJohannes Schindelin
2007-07-07Enable "git rerere" by the config variable rerere.enabledJohannes Schindelin
2007-07-03Rewrite "git-frotz" to "git frotz"Junio C Hamano
2007-06-07War on whitespaceJunio C Hamano
2007-05-04posix compatibility for t4200Bryan Larsen
2007-04-04rerere: make sorting really stable.Junio C Hamano
2007-04-04Fix t4200-rerere for white-space from "wc -l"Brian Gernhardt
2007-04-04Merge 1.5.0.7 inJunio C Hamano
2007-04-04rerere should not repeat the earlier hunks in later onesJunio C Hamano
2007-03-04Get rid of the dependency to GNU diff in the testsJohannes Schindelin
2007-02-25Update tests to use test-chmtimeEric Wong
2007-02-07t4200: skip gc-rerere test on systems with non GNU date.Junio C Hamano
2007-01-18Use standard -t option for touch.Simon 'corecode' Schubert
2006-12-22Add a test for git-rerereJohannes Schindelin