summaryrefslogtreecommitdiff
path: root/rerere.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/cache-unmerge'Junio C Hamano2010-01-201-0/+1
|\
| * rerere forget path: forget recorded resolutionJunio C Hamano2010-01-101-0/+1
* | Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano2009-12-041-2/+8
|/
* rerere: remove duplicated functionsSZEDER Gábor2009-02-141-0/+2
* Rename path_list to string_listJohannes Schindelin2008-07-211-2/+2
* rerere: Separate libgit and builtin functionsStephan Beyer2008-07-101-0/+9