summaryrefslogtreecommitdiff
path: root/builtin-rerere.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2007-02-251-6/+10
|\
| * rerere: do not deal with symlinks.Junio C Hamano2007-02-251-5/+9
| * rerere: do not skip two conflicted paths next to each other.Junio C Hamano2007-02-251-1/+1
* | prefixcmp(): fix-up mechanical conversion.Junio C Hamano2007-02-201-3/+3
* | Mechanical conversion to use prefixcmp()Junio C Hamano2007-02-201-3/+3
|/
* short i/o: fix calls to write to use xwrite or write_in_fullAndy Whitcroft2007-01-081-4/+7
* rerere: Fix removal of already resolved path.Junio C Hamano2007-01-041-4/+3
* rerere gc: honor configuration and document itJunio C Hamano2006-12-271-0/+13
* Make git-rerere a builtinJohannes Schindelin2006-12-211-0/+406