summaryrefslogtreecommitdiff
path: root/rerere.c
AgeCommit message (Expand)AuthorFilesLines
2016-04-06rerere: split code to call ll_merge() furtherLibravatar Junio C Hamano1-16/+31
2016-04-06rerere: move code related to "forget" togetherLibravatar Junio C Hamano1-97/+97
2016-04-06rerere: gc and clearLibravatar Junio C Hamano1-39/+48
2016-03-15rerere: do use multiple variantsLibravatar Junio C Hamano1-38/+60
2016-03-15rerere: allow multiple variants to existLibravatar Junio C Hamano1-22/+105
2016-03-15rerere: delay the recording of preimageLibravatar Junio C Hamano1-27/+25
2016-03-15rerere: handle leftover rr-cache/$ID directory and postimage filesLibravatar Junio C Hamano1-17/+25
2016-02-17Merge branch 'jk/rerere-xsnprintf'Libravatar Junio C Hamano1-2/+2
2016-02-08rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_idLibravatar Junio C Hamano1-3/+29
2016-02-08rerere: split conflict ID furtherLibravatar Junio C Hamano1-5/+56
2016-02-08rerere: replace strcpy with xsnprintfLibravatar Jeff King1-2/+2
2015-10-05Merge branch 'jc/rerere'Libravatar Junio C Hamano1-151/+404
2015-09-01rerere: release lockfile in non-writing functionsLibravatar Jeff King1-2/+15
2015-08-10memoize common git-path "constant" filesLibravatar Jeff King1-11/+8
2015-07-24rerere: un-nest merge() furtherLibravatar Junio C Hamano1-24/+26
2015-07-24rerere: use "struct rerere_id" instead of "char *" for conflict IDLibravatar Junio C Hamano1-26/+73
2015-07-24rerere: call conflict-ids IDsLibravatar Junio C Hamano1-38/+38
2015-07-24rerere: further clarify do_rerere_one_path()Libravatar Junio C Hamano1-9/+6
2015-07-24rerere: further de-dent do_plain_rerere()Libravatar Junio C Hamano1-32/+33
2015-07-24rerere: refactor "replay" part of do_plain_rerere()Libravatar Junio C Hamano1-35/+40
2015-07-24rerere: explain the remainderLibravatar Junio C Hamano1-0/+20
2015-07-24rerere: explain "rerere forget" codepathLibravatar Junio C Hamano1-0/+24
2015-07-24rerere: explain the primary codepathLibravatar Junio C Hamano1-13/+82
2015-07-24rerere: explain MERGE_RR management helpersLibravatar Junio C Hamano1-0/+41
2015-07-24rerere: fix benign off-by-one non-bug and clarify codeLibravatar Junio C Hamano1-1/+8
2015-07-24rerere: explain the rerere I/O abstractionLibravatar Junio C Hamano1-7/+31
2015-07-24rerere: do not leak mmfile[] for a path with multiple stage #1 entriesLibravatar Junio C Hamano1-2/+4
2015-07-24rerere: stop looping unnecessarilyLibravatar Junio C Hamano1-10/+7
2015-07-24rerere: drop want_sp parameter from is_cmarker()Libravatar Junio C Hamano1-5/+22
2015-07-24rerere: report autoupdated paths only after actually updating themLibravatar Junio C Hamano1-10/+12
2015-07-24rerere: write out each record of MERGE_RR in one goLibravatar Junio C Hamano1-7/+9
2015-07-24rerere: lift PATH_MAX limitationLibravatar Junio C Hamano1-20/+15
2015-07-24rerere: plug conflict ID leaksLibravatar Junio C Hamano1-2/+5
2015-07-24rerere: handle conflicts with multiple stage #1 entriesLibravatar Junio C Hamano1-1/+1
2015-06-28rerere: fix an off-by-one non-bugLibravatar Junio C Hamano1-4/+2
2015-05-26Merge branch 'jk/rerere-forget-check-enabled'Libravatar Junio C Hamano1-0/+2
2015-05-14rerere: exit silently on "forget" when rerere is disabledLibravatar Jeff King1-0/+2
2015-02-24Merge branch 'jn/rerere-fail-on-auto-update-failure' into maintLibravatar Junio C Hamano1-10/+6
2015-02-11Merge branch 'jn/rerere-fail-on-auto-update-failure'Libravatar Junio C Hamano1-10/+6
2015-01-08rerere: error out on autoupdate failureLibravatar Jonathan Nieder1-10/+6
2014-10-01lockfile.h: extract new header file for the functions in lockfile.cLibravatar Michael Haggerty1-0/+1
2014-08-07rerere.c: replace `git_config()` with `git_config_get_*()` familyLibravatar Tanay Abhra1-31/+12
2014-07-16Merge branch 'rs/code-cleaning'Libravatar Junio C Hamano1-2/+2
2014-07-10use strbuf_addbuf for adding strbufsLibravatar René Scharfe1-2/+2
2014-06-13read-cache: new API write_locked_index instead of write_index/write_cacheLibravatar Nguyễn Thái Ngọc Duy1-2/+1
2014-02-24pathspec: pass directory indicator to match_pathspec_item()Libravatar Nguyễn Thái Ngọc Duy1-1/+1
2014-02-24pathspec: rename match_pathspec_depth() to match_pathspec()Libravatar Nguyễn Thái Ngọc Duy1-2/+2
2013-09-09Merge branch 'jl/submodule-mv'Libravatar Junio C Hamano1-3/+4
2013-07-15convert unmerge_cache to take struct pathspecLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2013-07-15rerere: convert to use parse_pathspecLibravatar Nguyễn Thái Ngọc Duy1-4/+5
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-24 23:21:11 +0000