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