summaryrefslogtreecommitdiff
path: root/builtin-rerere.c
Commit message (Expand)AuthorAgeFilesLines
* Export rerere() and launch_editor().Kristian Høgsberg2007-09-271-5/+26
* rerere: Fix use of an empty strbuf.bufJunio C Hamano2007-09-261-2/+4
* Make builtin-rerere use of strbuf nicer and more efficient.Pierre Habouzit2007-09-261-25/+18
* Now that cache.h needs strbuf.h, remove useless includes.Pierre Habouzit2007-09-161-1/+0
* Strbuf API extensions and fixes.Pierre Habouzit2007-09-101-2/+2
* Use strbuf API in buitin-rerere.cPierre Habouzit2007-09-061-38/+18
* Make every builtin-*.c file #include "builtin.h"Peter Hagervall2007-07-141-0/+1
* rerere: record resolution even if file is not in merge baseJohannes Schindelin2007-07-091-10/+7
* Merge branch 'jc/diff-mark'Junio C Hamano2007-07-071-1/+1
|\
| * Future-proof source for changes in xdemitconf_tJohannes Schindelin2007-07-061-1/+1
* | Enable "git rerere" by the config variable rerere.enabledJohannes Schindelin2007-07-061-4/+28
|/
* detect close failure on just-written file handlesJim Meyering2007-06-261-1/+2
* War on whitespaceJunio C Hamano2007-06-071-1/+0
* rerere: make sorting really stable.Junio C Hamano2007-04-041-2/+5
* Merge 1.5.0.7 inJunio C Hamano2007-04-031-0/+9
|\
| * rerere should not repeat the earlier hunks in later onesJunio C Hamano2007-04-031-0/+9
* | 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
View Lorry Controller Status