summaryrefslogtreecommitdiff
path: root/rerere.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce2008-09-291-10/+19
|\
| * rerere: understand "diff3 -m" style conflicts with the originalJunio C Hamano2008-08-301-2/+8
| * rerere.c: use symbolic constants to keep track of parsing statesJunio C Hamano2008-08-301-10/+13
* | is_directory(): a generic helper functionJunio C Hamano2008-09-091-2/+1
|/
* Rename path_list to string_listJohannes Schindelin2008-07-211-20/+20
* rerere.autoupdate: change the message when autoupdate is in effectJunio C Hamano2008-07-161-2/+5
* Merge branch 'js/merge-rr'Junio C Hamano2008-07-141-1/+1
* rerere: Separate libgit and builtin functionsStephan Beyer2008-07-101-0/+360