summaryrefslogtreecommitdiff
path: root/t/t4200-rerere.sh
Commit message (Expand)AuthorAgeFilesLines
* rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolvedjc/cutoff-configJunio C Hamano2017-08-221-0/+2
* t4200: parameterize "rerere gc" custom expiry testJunio C Hamano2017-08-221-25/+33
* t4200: gather "rerere gc" togetherJunio C Hamano2017-08-221-27/+27
* t4200: make "rerere gc" test more robustJunio C Hamano2017-08-221-5/+14
* t4200: give us a clean slate after "rerere gc" testsJunio C Hamano2017-08-221-0/+2
* rerere: adjust 'forget' to multi-variant world orderJunio C Hamano2016-04-061-0/+10
* rerere: gc and clearJunio C Hamano2016-04-061-6/+75
* rerere: do use multiple variantsJunio C Hamano2016-03-151-1/+1
* t4200: rerere a merge with two identical conflictsJunio C Hamano2016-03-151-0/+74
* rerere: handle leftover rr-cache/$ID directory and postimage filesJunio C Hamano2016-03-151-1/+16
* Merge branch 'fc/trivial'Junio C Hamano2013-11-061-1/+1
|\
| * t: replace pulls with mergesFelipe Contreras2013-10-311-1/+1
* | t: use perl instead of "$PERL_PATH" where applicablejk/wrap-perl-used-in-testsJeff King2013-10-291-4/+4
|/
* Fix tests under GETTEXT_POISON on parseoptJiang Xin2012-08-271-2/+2
* tests: enclose $PERL_PATH in double quotesJunio C Hamano2012-06-241-4/+4
* t: Replace 'perl' by $PERL_PATHVincent van Ravesteijn2012-06-121-4/+4
* Merge branch 'jn/merge-renormalize'Junio C Hamano2010-09-031-131/+277
|\
| * rerere: migrate to parse-options APIJonathan Nieder2010-08-061-0/+91
| * t4200 (rerere): modernize styleJonathan Nieder2010-08-061-125/+180
* | rerere: fix overeager gcSZEDER Gábor2010-07-141-3/+11
|/
* Use test_expect_success for test setupsBrian Gernhardt2010-03-201-34/+36
* Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano2009-12-041-0/+15
* t4200: convert sed expression which operates on non-text file to perlBrandon Casey2009-05-061-1/+1
* t4200: remove two unnecessary linesBrandon Casey2009-05-061-2/+0
* Merge branch 'sb/dashless'Junio C Hamano2008-07-161-5/+5
|\
| * t/: Use "test_must_fail git" instead of "! git"Stephan Beyer2008-07-131-5/+5
* | Move MERGE_RR from .git/rr-cache/ into .git/Johannes Schindelin2008-07-131-3/+3
* | builtin-rerere: more carefully find conflict markersOlivier Marin2008-07-101-6/+20
|/
* rerere.autoupdateJunio C Hamano2008-06-221-0/+10
* t4200: fix rerere testJunio C Hamano2008-06-221-3/+3
* tests: do not use implicit "git diff --no-index"Junio C Hamano2008-05-241-3/+3
* more tr portability test script fixesJeff King2008-03-131-1/+1
* the use of 'tr' in the test suite isn't really portableH.Merijn Brand2007-12-171-1/+1
* rerere: record resolution even if file is not in merge baseJohannes Schindelin2007-07-091-5/+39
* Enable "git rerere" by the config variable rerere.enabledJohannes Schindelin2007-07-061-3/+20
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-021-1/+1
* War on whitespaceJunio C Hamano2007-06-071-2/+0
* posix compatibility for t4200Bryan Larsen2007-05-031-1/+1
* rerere: make sorting really stable.Junio C Hamano2007-04-041-4/+5
* Fix t4200-rerere for white-space from "wc -l"Brian Gernhardt2007-04-041-2/+2
* Merge 1.5.0.7 inJunio C Hamano2007-04-031-4/+17
|\
| * rerere should not repeat the earlier hunks in later onesJunio C Hamano2007-04-031-4/+17
* | Get rid of the dependency to GNU diff in the testsJohannes Schindelin2007-03-041-3/+3
* | Update tests to use test-chmtimeEric Wong2007-02-251-33/+20
|/
* t4200: skip gc-rerere test on systems with non GNU date.Junio C Hamano2007-02-071-20/+17
* Use standard -t option for touch.Simon 'corecode' Schubert2007-01-181-12/+12
* Add a test for git-rerereJohannes Schindelin2006-12-211-0/+154
View Lorry Controller Status