summaryrefslogtreecommitdiff
path: root/rerere.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/rerere-multi'Junio C Hamano2016-04-251-1/+3
|\
| * rerere: allow multiple variants to existJunio C Hamano2016-03-151-0/+1
| * rerere: split conflict ID furtherJunio C Hamano2016-02-081-1/+2
* | Merge branch 'jc/rerere'Junio C Hamano2015-10-051-1/+11
|\ \ | |/
| * rerere: use "struct rerere_id" instead of "char *" for conflict IDJunio C Hamano2015-07-241-1/+11
| * rerere: call conflict-ids IDsJunio C Hamano2015-07-241-1/+1
* | rerere: release lockfile in non-writing functionsjk/am-rerere-lock-fixJeff King2015-09-011-0/+1
|/
* rerere.h: mark string for translationMatthias Ruester2014-09-151-1/+1
* rerere: convert to use parse_pathspecNguyễn Thái Ngọc Duy2013-07-151-1/+3
* rerere.c: mark private file-scope symbols as staticJunio C Hamano2012-09-151-1/+0
* rerere: libify rerere_clear() and rerere_gc()Junio C Hamano2011-05-081-0/+2
* rerere "remaining"Martin von Zweigbergk2011-02-161-0/+8
* 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
View Lorry Controller Status