path: root/rerere.h
AgeCommit message (Expand)Author
2016-04-25Merge branch 'jc/rerere-multi'Junio C Hamano
2016-03-15rerere: allow multiple variants to existJunio C Hamano
2016-02-08rerere: split conflict ID furtherJunio C Hamano
2015-10-05Merge branch 'jc/rerere'Junio C Hamano
2015-09-01rerere: release lockfile in non-writing functionsJeff King
2015-07-24rerere: use "struct rerere_id" instead of "char *" for conflict IDJunio C Hamano
2015-07-24rerere: call conflict-ids IDsJunio C Hamano
2014-09-15rerere.h: mark string for translationMatthias Ruester
2013-07-15rerere: convert to use parse_pathspecNguyễn Thái Ngọc Duy
2012-09-16rerere.c: mark private file-scope symbols as staticJunio C Hamano
2011-05-08rerere: libify rerere_clear() and rerere_gc()Junio C Hamano
2011-02-16rerere "remaining"Martin von Zweigbergk
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