summaryrefslogtreecommitdiff
path: root/git-rerere.perl
Commit message (Expand)AuthorAgeFilesLines
* rerere: fix breakage of resolving.Junio C Hamano2006-12-181-1/+1
* Merge branch 'ew/rerere'Junio C Hamano2006-12-131-0/+57
|\
| * git-rerere: add 'gc' command.Junio C Hamano2006-12-091-0/+25
| * rerere: add clear, diff, and status commandsEric Wong2006-12-091-0/+32
* | Get rid of the dependency on RCS' merge programJohannes Schindelin2006-12-121-1/+1
|/
* rerere: avoid open "-|" list form for Perl 5.6Junio C Hamano2006-02-201-1/+5
* git-rerere: reuse recorded resolve.Junio C Hamano2006-02-061-0/+223