summaryrefslogtreecommitdiff
path: root/rerere.c
AgeCommit message (Expand)AuthorFilesLines
2008-09-29Merge branch 'jc/better-conflict-resolution'Libravatar Shawn O. Pearce1-10/+19
2008-09-09is_directory(): a generic helper functionLibravatar Junio C Hamano1-2/+1
2008-08-30rerere: understand "diff3 -m" style conflicts with the originalLibravatar Junio C Hamano1-2/+8
2008-08-30rerere.c: use symbolic constants to keep track of parsing statesLibravatar Junio C Hamano1-10/+13
2008-07-21Rename path_list to string_listLibravatar Johannes Schindelin1-20/+20
2008-07-16rerere.autoupdate: change the message when autoupdate is in effectLibravatar Junio C Hamano1-2/+5
2008-07-14Merge branch 'js/merge-rr'Libravatar Junio C Hamano1-1/+1
2008-07-10rerere: Separate libgit and builtin functionsLibravatar Stephan Beyer1-0/+360