summaryrefslogtreecommitdiff
path: root/rerere.h
AgeCommit message (Expand)AuthorFilesLines
2018-03-07completion: don't set PARSE_OPT_NOCOMPLETE on --rerere-autoupdateLibravatar Nguyễn Thái Ngọc Duy1-2/+1
2018-02-09completion: use __gitcomp_builtin in _git_amLibravatar Nguyễn Thái Ngọc Duy1-1/+2
2016-04-25Merge branch 'jc/rerere-multi'Libravatar Junio C Hamano1-1/+3
2016-03-15rerere: allow multiple variants to existLibravatar Junio C Hamano1-0/+1
2016-02-08rerere: split conflict ID furtherLibravatar Junio C Hamano1-1/+2
2015-10-05Merge branch 'jc/rerere'Libravatar Junio C Hamano1-1/+11
2015-09-01rerere: release lockfile in non-writing functionsLibravatar Jeff King1-0/+1
2015-07-24rerere: use "struct rerere_id" instead of "char *" for conflict IDLibravatar Junio C Hamano1-1/+11
2015-07-24rerere: call conflict-ids IDsLibravatar Junio C Hamano1-1/+1
2014-09-15rerere.h: mark string for translationLibravatar Matthias Ruester1-1/+1
2013-07-15rerere: convert to use parse_pathspecLibravatar Nguyễn Thái Ngọc Duy1-1/+3
2012-09-15rerere.c: mark private file-scope symbols as staticLibravatar Junio C Hamano1-1/+0
2011-05-08rerere: libify rerere_clear() and rerere_gc()Libravatar Junio C Hamano1-0/+2
2011-02-16rerere "remaining"Libravatar Martin von Zweigbergk1-0/+8
2010-01-20Merge branch 'jc/cache-unmerge'Libravatar Junio C Hamano1-0/+1
2010-01-10rerere forget path: forget recorded resolutionLibravatar Junio C Hamano1-0/+1
2009-12-04Teach --[no-]rerere-autoupdate option to merge, revert and friendsLibravatar Junio C Hamano1-2/+8
2009-02-14rerere: remove duplicated functionsLibravatar SZEDER Gábor1-0/+2
2008-07-21Rename path_list to string_listLibravatar Johannes Schindelin1-2/+2
2008-07-10rerere: Separate libgit and builtin functionsLibravatar Stephan Beyer1-0/+9
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 19:34:09 +0000