aboutsummaryrefslogtreecommitdiff
path: root/rerere.c
Commit message (Expand)AuthorAge
* Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce2008-09-29
|\
| * rerere: understand "diff3 -m" style conflicts with the originalJunio C Hamano2008-08-30
| * rerere.c: use symbolic constants to keep track of parsing statesJunio C Hamano2008-08-30
* | is_directory(): a generic helper functionJunio C Hamano2008-09-09
|/
* Rename path_list to string_listJohannes Schindelin2008-07-21
* rerere.autoupdate: change the message when autoupdate is in effectJunio C Hamano2008-07-16
* Merge branch 'js/merge-rr'Junio C Hamano2008-07-14
* rerere: Separate libgit and builtin functionsStephan Beyer2008-07-10