Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | rerere: make sorting really stable. | Junio C Hamano | 2007-04-04 | 1 | -2/+5 |
* | Merge 1.5.0.7 in | Junio C Hamano | 2007-04-03 | 1 | -0/+9 |
|\ | |||||
| * | rerere should not repeat the earlier hunks in later ones | Junio C Hamano | 2007-04-03 | 1 | -0/+9 |
* | | Merge branch 'maint' | Junio C Hamano | 2007-02-25 | 1 | -6/+10 |
|\ \ | |/ | |||||
| * | rerere: do not deal with symlinks. | Junio C Hamano | 2007-02-25 | 1 | -5/+9 |
| * | rerere: do not skip two conflicted paths next to each other. | Junio C Hamano | 2007-02-25 | 1 | -1/+1 |
* | | prefixcmp(): fix-up mechanical conversion. | Junio C Hamano | 2007-02-20 | 1 | -3/+3 |
* | | Mechanical conversion to use prefixcmp() | Junio C Hamano | 2007-02-20 | 1 | -3/+3 |
|/ | |||||
* | short i/o: fix calls to write to use xwrite or write_in_full | Andy Whitcroft | 2007-01-08 | 1 | -4/+7 |
* | rerere: Fix removal of already resolved path. | Junio C Hamano | 2007-01-04 | 1 | -4/+3 |
* | rerere gc: honor configuration and document it | Junio C Hamano | 2006-12-27 | 1 | -0/+13 |
* | Make git-rerere a builtin | Johannes Schindelin | 2006-12-21 | 1 | -0/+406 |