summaryrefslogtreecommitdiffstats
path: root/t/t4200-rerere.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* t4200: make hash size independentbrian m. carlson2020-01-151-1/+2
* Merge branch 'en/rerere-multi-stage-1-fix'Junio C Hamano2018-09-241-0/+29
|\
| * rerere: avoid buffer overrunElijah Newren2018-09-111-1/+1
| * t4200: demonstrate rerere segfault on specially crafted mergeElijah Newren2018-09-111-0/+29
* | Merge branch 'tg/rerere'Junio C Hamano2018-09-171-0/+65
|\ \
| * | rerere: recalculate conflict ID when unresolved conflict is committedThomas Gummerer2018-08-061-0/+7
| * | rerere: teach rerere to handle nested conflictsThomas Gummerer2018-08-061-0/+37
| * | rerere: fix crash with files rerere can't handleThomas Gummerer2018-08-061-0/+21
* | | tests: make use of the test_must_be_empty functionÆvar Arnfjörð Bjarmason2018-07-301-6/+3
|/ /
* | t: switch $_z40 to $ZERO_OIDbrian m. carlson2018-05-141-1/+1
* | Merge branch 'ps/test-chmtime-get'Junio C Hamano2018-04-251-4/+4
|\ \
| * | t/helper: 'test-chmtime (--get|-g)' to print only the mtimePaul-Sebastian Ungureanu2018-04-091-4/+4
| |/
* / t/helper: merge test-chmtime into test-toolNguyễn Thái Ngọc Duy2018-03-271-11/+11
|/
* rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolvedJunio 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-071-0/+10
* rerere: gc and clearJunio C Hamano2016-04-071-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 applicableJeff 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-251-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-071-1/+1
* t4200: remove two unnecessary linesBrandon Casey2009-05-071-2/+0
* Merge branch 'sb/dashless'Junio C Hamano2008-07-171-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-181-1/+1
* rerere: record resolution even if file is not in merge baseJohannes Schindelin2007-07-101-5/+39
* Enable "git rerere" by the config variable rerere.enabledJohannes Schindelin2007-07-071-3/+20
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-031-1/+1
* War on whitespaceJunio C Hamano2007-06-071-2/+0
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 09:16:43 +0100