aboutsummaryrefslogtreecommitdiff
path: root/t/t4200-rerere.sh
Commit message (Expand)AuthorAge
* rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolvedJunio C Hamano2017-08-22
* t4200: parameterize "rerere gc" custom expiry testJunio C Hamano2017-08-22
* t4200: gather "rerere gc" togetherJunio C Hamano2017-08-22
* t4200: make "rerere gc" test more robustJunio C Hamano2017-08-22
* t4200: give us a clean slate after "rerere gc" testsJunio C Hamano2017-08-22
* rerere: adjust 'forget' to multi-variant world orderJunio C Hamano2016-04-06
* rerere: gc and clearJunio C Hamano2016-04-06
* rerere: do use multiple variantsJunio C Hamano2016-03-15
* t4200: rerere a merge with two identical conflictsJunio C Hamano2016-03-15
* rerere: handle leftover rr-cache/$ID directory and postimage filesJunio C Hamano2016-03-15
* Merge branch 'fc/trivial'Junio C Hamano2013-11-06
|\
| * t: replace pulls with mergesFelipe Contreras2013-10-31
* | t: use perl instead of "$PERL_PATH" where applicableJeff King2013-10-29
|/
* Fix tests under GETTEXT_POISON on parseoptJiang Xin2012-08-27
* tests: enclose $PERL_PATH in double quotesJunio C Hamano2012-06-24
* t: Replace 'perl' by $PERL_PATHVincent van Ravesteijn2012-06-12
* Merge branch 'jn/merge-renormalize'Junio C Hamano2010-09-03
|\
| * rerere: migrate to parse-options APIJonathan Nieder2010-08-06
| * t4200 (rerere): modernize styleJonathan Nieder2010-08-06
* | rerere: fix overeager gcSZEDER Gábor2010-07-14
|/
* Use test_expect_success for test setupsBrian Gernhardt2010-03-20
* Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano2009-12-04
* t4200: convert sed expression which operates on non-text file to perlBrandon Casey2009-05-06
* t4200: remove two unnecessary linesBrandon Casey2009-05-06
* Merge branch 'sb/dashless'Junio C Hamano2008-07-16
|\
| * t/: Use "test_must_fail git" instead of "! git"Stephan Beyer2008-07-13
* | Move MERGE_RR from .git/rr-cache/ into .git/Johannes Schindelin2008-07-13
* | builtin-rerere: more carefully find conflict markersOlivier Marin2008-07-10
|/
* rerere.autoupdateJunio C Hamano2008-06-22
* t4200: fix rerere testJunio C Hamano2008-06-22
* tests: do not use implicit "git diff --no-index"Junio C Hamano2008-05-24
* more tr portability test script fixesJeff King2008-03-13
* the use of 'tr' in the test suite isn't really portableH.Merijn Brand2007-12-17
* rerere: record resolution even if file is not in merge baseJohannes Schindelin2007-07-09
* Enable "git rerere" by the config variable rerere.enabledJohannes Schindelin2007-07-06
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-02
* War on whitespaceJunio C Hamano2007-06-07
* posix compatibility for t4200Bryan Larsen2007-05-03
* rerere: make sorting really stable.Junio C Hamano2007-04-04
* Fix t4200-rerere for white-space from "wc -l"Brian Gernhardt2007-04-04
* Merge 1.5.0.7 inJunio C Hamano2007-04-03
|\
| * rerere should not repeat the earlier hunks in later onesJunio C Hamano2007-04-03
* | Get rid of the dependency to GNU diff in the testsJohannes Schindelin2007-03-04
* | Update tests to use test-chmtimeEric Wong2007-02-25
|/
* t4200: skip gc-rerere test on systems with non GNU date.Junio C Hamano2007-02-07
* Use standard -t option for touch.Simon 'corecode' Schubert2007-01-18
* Add a test for git-rerereJohannes Schindelin2006-12-21
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-18 11:38:38 +0000