summaryrefslogtreecommitdiff
path: root/t/t4200-rerere.sh
Commit message (Expand)AuthorAgeFilesLines
* rerere: record resolution even if file is not in merge baseJohannes Schindelin2007-07-091-5/+39
* Enable "git rerere" by the config variable rerere.enabledJohannes Schindelin2007-07-061-3/+20
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-021-1/+1
* War on whitespaceJunio C Hamano2007-06-071-2/+0
* posix compatibility for t4200Bryan Larsen2007-05-031-1/+1
* rerere: make sorting really stable.Junio C Hamano2007-04-041-4/+5
* Fix t4200-rerere for white-space from "wc -l"Brian Gernhardt2007-04-041-2/+2
* Merge 1.5.0.7 inJunio C Hamano2007-04-031-4/+17
|\
| * rerere should not repeat the earlier hunks in later onesJunio C Hamano2007-04-031-4/+17
* | Get rid of the dependency to GNU diff in the testsJohannes Schindelin2007-03-041-3/+3
* | Update tests to use test-chmtimeEric Wong2007-02-251-33/+20
|/
* t4200: skip gc-rerere test on systems with non GNU date.Junio C Hamano2007-02-071-20/+17
* Use standard -t option for touch.Simon 'corecode' Schubert2007-01-181-12/+12
* Add a test for git-rerereJohannes Schindelin2006-12-211-0/+154
View Lorry Controller Status