summaryrefslogtreecommitdiff
path: root/t/t4200-rerere.sh
AgeCommit message (Expand)AuthorFilesLines
2007-07-09rerere: record resolution even if file is not in merge baseLibravatar Johannes Schindelin1-5/+39
2007-07-06Enable "git rerere" by the config variable rerere.enabledLibravatar Johannes Schindelin1-3/+20
2007-07-02Rewrite "git-frotz" to "git frotz"Libravatar Junio C Hamano1-1/+1
2007-06-07War on whitespaceLibravatar Junio C Hamano1-2/+0
2007-05-03posix compatibility for t4200Libravatar Bryan Larsen1-1/+1
2007-04-04rerere: make sorting really stable.Libravatar Junio C Hamano1-4/+5
2007-04-04Fix t4200-rerere for white-space from "wc -l"Libravatar Brian Gernhardt1-2/+2
2007-04-03Merge 1.5.0.7 inLibravatar Junio C Hamano1-4/+17
2007-04-03rerere should not repeat the earlier hunks in later onesLibravatar Junio C Hamano1-4/+17
2007-03-04Get rid of the dependency to GNU diff in the testsLibravatar Johannes Schindelin1-3/+3
2007-02-25Update tests to use test-chmtimeLibravatar Eric Wong1-33/+20
2007-02-07t4200: skip gc-rerere test on systems with non GNU date.Libravatar Junio C Hamano1-20/+17
2007-01-18Use standard -t option for touch.Libravatar Simon 'corecode' Schubert1-12/+12
2006-12-21Add a test for git-rerereLibravatar Johannes Schindelin1-0/+154
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 16:35:02 +0000