Age | Commit message (Expand) | Author | Files | Lines |
2018-09-24 | Merge branch 'en/rerere-multi-stage-1-fix' | Junio C Hamano | 1 | -0/+29 |
2018-09-17 | Merge branch 'tg/rerere' | Junio C Hamano | 1 | -0/+65 |
2018-09-11 | rerere: avoid buffer overrun | Elijah Newren | 1 | -1/+1 |
2018-09-11 | t4200: demonstrate rerere segfault on specially crafted merge | Elijah Newren | 1 | -0/+29 |
2018-08-06 | rerere: recalculate conflict ID when unresolved conflict is committed | Thomas Gummerer | 1 | -0/+7 |
2018-08-06 | rerere: teach rerere to handle nested conflicts | Thomas Gummerer | 1 | -0/+37 |
2018-08-06 | rerere: fix crash with files rerere can't handle | Thomas Gummerer | 1 | -0/+21 |
2018-07-30 | tests: make use of the test_must_be_empty function | Ævar Arnfjörð Bjarmason | 1 | -6/+3 |
2018-05-14 | t: switch $_z40 to $ZERO_OID | brian m. carlson | 1 | -1/+1 |
2018-04-25 | Merge branch 'ps/test-chmtime-get' | Junio C Hamano | 1 | -4/+4 |
2018-04-09 | t/helper: 'test-chmtime (--get|-g)' to print only the mtime | Paul-Sebastian Ungureanu | 1 | -4/+4 |
2018-03-27 | t/helper: merge test-chmtime into test-tool | Nguyễn Thái Ngọc Duy | 1 | -11/+11 |
2017-08-22 | rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolved | Junio C Hamano | 1 | -0/+2 |
2017-08-22 | t4200: parameterize "rerere gc" custom expiry test | Junio C Hamano | 1 | -25/+33 |
2017-08-22 | t4200: gather "rerere gc" together | Junio C Hamano | 1 | -27/+27 |
2017-08-22 | t4200: make "rerere gc" test more robust | Junio C Hamano | 1 | -5/+14 |
2017-08-22 | t4200: give us a clean slate after "rerere gc" tests | Junio C Hamano | 1 | -0/+2 |
2016-04-06 | rerere: adjust 'forget' to multi-variant world order | Junio C Hamano | 1 | -0/+10 |
2016-04-06 | rerere: gc and clear | Junio C Hamano | 1 | -6/+75 |
2016-03-15 | rerere: do use multiple variants | Junio C Hamano | 1 | -1/+1 |
2016-03-15 | t4200: rerere a merge with two identical conflicts | Junio C Hamano | 1 | -0/+74 |
2016-03-15 | rerere: handle leftover rr-cache/$ID directory and postimage files | Junio C Hamano | 1 | -1/+16 |
2013-11-06 | Merge branch 'fc/trivial' | Junio C Hamano | 1 | -1/+1 |
2013-10-31 | t: replace pulls with merges | Felipe Contreras | 1 | -1/+1 |
2013-10-29 | t: use perl instead of "$PERL_PATH" where applicable | Jeff King | 1 | -4/+4 |
2012-08-27 | Fix tests under GETTEXT_POISON on parseopt | Jiang Xin | 1 | -2/+2 |
2012-06-24 | tests: enclose $PERL_PATH in double quotes | Junio C Hamano | 1 | -4/+4 |
2012-06-12 | t: Replace 'perl' by $PERL_PATH | Vincent van Ravesteijn | 1 | -4/+4 |
2010-09-03 | Merge branch 'jn/merge-renormalize' | Junio C Hamano | 1 | -131/+277 |
2010-08-06 | rerere: migrate to parse-options API | Jonathan Nieder | 1 | -0/+91 |
2010-08-06 | t4200 (rerere): modernize style | Jonathan Nieder | 1 | -125/+180 |
2010-07-14 | rerere: fix overeager gc | SZEDER Gábor | 1 | -3/+11 |
2010-03-20 | Use test_expect_success for test setups | Brian Gernhardt | 1 | -34/+36 |
2009-12-04 | Teach --[no-]rerere-autoupdate option to merge, revert and friends | Junio C Hamano | 1 | -0/+15 |
2009-05-06 | t4200: convert sed expression which operates on non-text file to perl | Brandon Casey | 1 | -1/+1 |
2009-05-06 | t4200: remove two unnecessary lines | Brandon Casey | 1 | -2/+0 |
2008-07-16 | Merge branch 'sb/dashless' | Junio C Hamano | 1 | -5/+5 |
2008-07-13 | t/: Use "test_must_fail git" instead of "! git" | Stephan Beyer | 1 | -5/+5 |
2008-07-13 | Move MERGE_RR from .git/rr-cache/ into .git/ | Johannes Schindelin | 1 | -3/+3 |
2008-07-10 | builtin-rerere: more carefully find conflict markers | Olivier Marin | 1 | -6/+20 |
2008-06-22 | rerere.autoupdate | Junio C Hamano | 1 | -0/+10 |
2008-06-22 | t4200: fix rerere test | Junio C Hamano | 1 | -3/+3 |
2008-05-24 | tests: do not use implicit "git diff --no-index" | Junio C Hamano | 1 | -3/+3 |
2008-03-13 | more tr portability test script fixes | Jeff King | 1 | -1/+1 |
2007-12-17 | the use of 'tr' in the test suite isn't really portable | H.Merijn Brand | 1 | -1/+1 |
2007-07-09 | rerere: record resolution even if file is not in merge base | Johannes Schindelin | 1 | -5/+39 |
2007-07-06 | Enable "git rerere" by the config variable rerere.enabled | Johannes Schindelin | 1 | -3/+20 |
2007-07-02 | Rewrite "git-frotz" to "git frotz" | Junio C Hamano | 1 | -1/+1 |
2007-06-07 | War on whitespace | Junio C Hamano | 1 | -2/+0 |
2007-05-03 | posix compatibility for t4200 | Bryan Larsen | 1 | -1/+1 |