summaryrefslogtreecommitdiff
path: root/builtin-rerere.c
AgeCommit message (Expand)AuthorFilesLines
2007-04-03Merge 1.5.0.7 inLibravatar Junio C Hamano1-0/+9
2007-04-03rerere should not repeat the earlier hunks in later onesLibravatar Junio C Hamano1-0/+9
2007-02-25Merge branch 'maint'Libravatar Junio C Hamano1-6/+10
2007-02-25rerere: do not deal with symlinks.Libravatar Junio C Hamano1-5/+9
2007-02-25rerere: do not skip two conflicted paths next to each other.Libravatar Junio C Hamano1-1/+1
2007-02-20prefixcmp(): fix-up mechanical conversion.Libravatar Junio C Hamano1-3/+3
2007-02-20Mechanical conversion to use prefixcmp()Libravatar Junio C Hamano1-3/+3
2007-01-08short i/o: fix calls to write to use xwrite or write_in_fullLibravatar Andy Whitcroft1-4/+7
2007-01-04rerere: Fix removal of already resolved path.Libravatar Junio C Hamano1-4/+3
2006-12-27rerere gc: honor configuration and document itLibravatar Junio C Hamano1-0/+13
2006-12-21Make git-rerere a builtinLibravatar Johannes Schindelin1-0/+406