aboutsummaryrefslogtreecommitdiffstats
path: root/rerere.h
AgeCommit message (Expand)AuthorFilesLines
2023-04-06Merge branch 'en/header-split-cleanup'Junio C Hamano1-0/+1
2023-03-28cocci: apply the "rerere.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-3/+0
2023-03-21treewide: be explicit about dependence on gettext.hElijah Newren1-0/+1
2018-11-12rerere.c: remove the_repository referencesNguyễn Thái Ngọc Duy1-3/+3
2018-09-21rerere.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-3/+7
2018-08-03rerere.h: drop extern from function declarationNguyễn Thái Ngọc Duy1-7/+7
2016-04-25Merge branch 'jc/rerere-multi'Junio C Hamano1-1/+3
2016-03-15rerere: allow multiple variants to existJunio C Hamano1-0/+1
2016-02-08rerere: split conflict ID furtherJunio C Hamano1-1/+2
2015-10-05Merge branch 'jc/rerere'Junio C Hamano1-1/+11
2015-09-01rerere: release lockfile in non-writing functionsJeff King1-0/+1
2015-07-24rerere: use "struct rerere_id" instead of "char *" for conflict IDJunio C Hamano1-1/+11
2015-07-24rerere: call conflict-ids IDsJunio C Hamano1-1/+1
2014-09-15rerere.h: mark string for translationMatthias Ruester1-1/+1
2013-07-15rerere: convert to use parse_pathspecNguyễn Thái Ngọc Duy1-1/+3
2012-09-15rerere.c: mark private file-scope symbols as staticJunio C Hamano1-1/+0
2011-05-08rerere: libify rerere_clear() and rerere_gc()Junio C Hamano1-0/+2
2011-02-16rerere "remaining"Martin von Zweigbergk1-0/+8
2010-01-20Merge branch 'jc/cache-unmerge'Junio C Hamano1-0/+1
2010-01-10rerere forget path: forget recorded resolutionJunio C Hamano1-0/+1
2009-12-04Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano1-2/+8
2009-02-14rerere: remove duplicated functionsSZEDER Gábor1-0/+2
2008-07-21Rename path_list to string_listJohannes Schindelin1-2/+2
2008-07-10rerere: Separate libgit and builtin functionsStephan Beyer1-0/+9
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-29 11:12:12 +0000