summaryrefslogtreecommitdiff
path: root/rerere.h
AgeCommit message (Expand)Author
2010-01-20Merge branch 'jc/cache-unmerge'Junio C Hamano
2010-01-11rerere forget path: forget recorded resolutionJunio C Hamano
2009-12-04Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano
2009-02-15rerere: remove duplicated functionsSZEDER G√°bor
2008-07-22Rename path_list to string_listJohannes Schindelin
2008-07-10rerere: Separate libgit and builtin functionsStephan Beyer