| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'fc/trivial' | Junio C Hamano | 2013-11-06 | 1 | -1/+1 |
|\ |
|
| * | t: replace pulls with merges | Felipe Contreras | 2013-10-31 | 1 | -1/+1 |
* | | t: use perl instead of "$PERL_PATH" where applicablejk/wrap-perl-used-in-tests | Jeff King | 2013-10-29 | 1 | -4/+4 |
|/ |
|
* | Fix tests under GETTEXT_POISON on parseopt | Jiang Xin | 2012-08-27 | 1 | -2/+2 |
* | tests: enclose $PERL_PATH in double quotes | Junio C Hamano | 2012-06-24 | 1 | -4/+4 |
* | t: Replace 'perl' by $PERL_PATH | Vincent van Ravesteijn | 2012-06-12 | 1 | -4/+4 |
* | Merge branch 'jn/merge-renormalize' | Junio C Hamano | 2010-09-03 | 1 | -131/+277 |
|\ |
|
| * | rerere: migrate to parse-options API | Jonathan Nieder | 2010-08-06 | 1 | -0/+91 |
| * | t4200 (rerere): modernize style | Jonathan Nieder | 2010-08-06 | 1 | -125/+180 |
* | | rerere: fix overeager gc | SZEDER Gábor | 2010-07-14 | 1 | -3/+11 |
|/ |
|
* | Use test_expect_success for test setups | Brian Gernhardt | 2010-03-20 | 1 | -34/+36 |
* | Teach --[no-]rerere-autoupdate option to merge, revert and friends | Junio C Hamano | 2009-12-04 | 1 | -0/+15 |
* | t4200: convert sed expression which operates on non-text file to perl | Brandon Casey | 2009-05-06 | 1 | -1/+1 |
* | t4200: remove two unnecessary lines | Brandon Casey | 2009-05-06 | 1 | -2/+0 |
* | Merge branch 'sb/dashless' | Junio C Hamano | 2008-07-16 | 1 | -5/+5 |
|\ |
|
| * | t/: Use "test_must_fail git" instead of "! git" | Stephan Beyer | 2008-07-13 | 1 | -5/+5 |
* | | Move MERGE_RR from .git/rr-cache/ into .git/ | Johannes Schindelin | 2008-07-13 | 1 | -3/+3 |
* | | builtin-rerere: more carefully find conflict markers | Olivier Marin | 2008-07-10 | 1 | -6/+20 |
|/ |
|
* | rerere.autoupdate | Junio C Hamano | 2008-06-22 | 1 | -0/+10 |
* | t4200: fix rerere test | Junio C Hamano | 2008-06-22 | 1 | -3/+3 |
* | tests: do not use implicit "git diff --no-index" | Junio C Hamano | 2008-05-24 | 1 | -3/+3 |
* | more tr portability test script fixes | Jeff King | 2008-03-13 | 1 | -1/+1 |
* | the use of 'tr' in the test suite isn't really portable | H.Merijn Brand | 2007-12-17 | 1 | -1/+1 |
* | rerere: record resolution even if file is not in merge base | Johannes Schindelin | 2007-07-09 | 1 | -5/+39 |
* | Enable "git rerere" by the config variable rerere.enabled | Johannes Schindelin | 2007-07-06 | 1 | -3/+20 |
* | Rewrite "git-frotz" to "git frotz" | Junio C Hamano | 2007-07-02 | 1 | -1/+1 |
* | War on whitespace | Junio C Hamano | 2007-06-07 | 1 | -2/+0 |
* | posix compatibility for t4200 | Bryan Larsen | 2007-05-03 | 1 | -1/+1 |
* | rerere: make sorting really stable. | Junio C Hamano | 2007-04-04 | 1 | -4/+5 |
* | Fix t4200-rerere for white-space from "wc -l" | Brian Gernhardt | 2007-04-04 | 1 | -2/+2 |
* | Merge 1.5.0.7 in | Junio C Hamano | 2007-04-03 | 1 | -4/+17 |
|\ |
|
| * | rerere should not repeat the earlier hunks in later ones | Junio C Hamano | 2007-04-03 | 1 | -4/+17 |
* | | Get rid of the dependency to GNU diff in the tests | Johannes Schindelin | 2007-03-04 | 1 | -3/+3 |
* | | Update tests to use test-chmtime | Eric Wong | 2007-02-25 | 1 | -33/+20 |
|/ |
|
* | t4200: skip gc-rerere test on systems with non GNU date. | Junio C Hamano | 2007-02-07 | 1 | -20/+17 |
* | Use standard -t option for touch. | Simon 'corecode' Schubert | 2007-01-18 | 1 | -12/+12 |
* | Add a test for git-rerere | Johannes Schindelin | 2006-12-21 | 1 | -0/+154 |