summaryrefslogtreecommitdiff
path: root/builtin-rerere.c
AgeCommit message (Expand)Author
2007-02-25Merge branch 'maint'Junio C Hamano
2007-02-25rerere: do not deal with symlinks.Junio C Hamano
2007-02-25rerere: do not skip two conflicted paths next to each other.Junio C Hamano
2007-02-21prefixcmp(): fix-up mechanical conversion.Junio C Hamano
2007-02-21Mechanical conversion to use prefixcmp()Junio C Hamano
2007-01-08short i/o: fix calls to write to use xwrite or write_in_fullAndy Whitcroft
2007-01-05rerere: Fix removal of already resolved path.Junio C Hamano
2006-12-27rerere gc: honor configuration and document itJunio C Hamano
2006-12-22Make git-rerere a builtinJohannes Schindelin