Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | rerere: understand "diff3 -m" style conflicts with the original | Junio C Hamano | 2008-08-30 | 1 | -2/+8 |
* | rerere.c: use symbolic constants to keep track of parsing states | Junio C Hamano | 2008-08-30 | 1 | -10/+13 |
* | Rename path_list to string_list | Johannes Schindelin | 2008-07-21 | 1 | -20/+20 |
* | rerere.autoupdate: change the message when autoupdate is in effect | Junio C Hamano | 2008-07-16 | 1 | -2/+5 |
* | Merge branch 'js/merge-rr' | Junio C Hamano | 2008-07-14 | 1 | -1/+1 |
* | rerere: Separate libgit and builtin functions | Stephan Beyer | 2008-07-10 | 1 | -0/+360 |