aboutsummaryrefslogtreecommitdiff
path: root/rerere.h
Commit message (Expand)AuthorAge
* Merge branch 'jc/rerere'Junio C Hamano2015-10-05
|\
| * rerere: use "struct rerere_id" instead of "char *" for conflict IDJunio C Hamano2015-07-24
| * rerere: call conflict-ids IDsJunio C Hamano2015-07-24
* | rerere: release lockfile in non-writing functionsJeff King2015-09-01
|/
* rerere.h: mark string for translationMatthias Ruester2014-09-15
* rerere: convert to use parse_pathspecNguyễn Thái Ngọc Duy2013-07-15
* rerere.c: mark private file-scope symbols as staticJunio C Hamano2012-09-15
* rerere: libify rerere_clear() and rerere_gc()Junio C Hamano2011-05-08
* rerere "remaining"Martin von Zweigbergk2011-02-16
* Merge branch 'jc/cache-unmerge'Junio C Hamano2010-01-20
|\
| * rerere forget path: forget recorded resolutionJunio C Hamano2010-01-10
* | Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano2009-12-04
|/
* rerere: remove duplicated functionsSZEDER Gábor2009-02-14
* Rename path_list to string_listJohannes Schindelin2008-07-21
* rerere: Separate libgit and builtin functionsStephan Beyer2008-07-10