summaryrefslogtreecommitdiffstats
path: root/rerere.c (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | wrapper.c: add and use fopen_or_warn()Nguyễn Thái Ngọc Duy2017-05-261-1/+1
|/
* hold_locked_index(): align error handling with hold_lockfile_for_update()Junio C Hamano2016-12-071-1/+1
* cache: convert struct cache_entry to use struct object_idbrian m. carlson2016-09-071-1/+2
* Merge branch 'jc/rerere-multi'Junio C Hamano2016-05-231-8/+17
|\
| * rerere: remove an null statementJunio C Hamano2016-05-191-1/+1
| * rerere: plug memory leaks upon "rerere forget" failureJunio C Hamano2016-05-121-8/+17
* | Merge branch 'nd/error-errno'Junio C Hamano2016-05-171-11/+7
|\ \
| * | rerere.c: use error_errno() and warning_errno()Nguyễn Thái Ngọc Duy2016-05-091-11/+7
* | | Merge branch 'jc/rerere-multi'Junio C Hamano2016-04-261-194/+432
|\ \ \ | |/ / |/| / | |/
| * rerere: adjust 'forget' to multi-variant world orderJunio C Hamano2016-04-071-1/+27
| * rerere: split code to call ll_merge() furtherJunio C Hamano2016-04-071-16/+31
| * rerere: move code related to "forget" togetherJunio C Hamano2016-04-071-97/+97
| * rerere: gc and clearJunio C Hamano2016-04-071-39/+48
| * rerere: do use multiple variantsJunio C Hamano2016-03-151-38/+60
| * rerere: allow multiple variants to existJunio C Hamano2016-03-151-22/+105
| * rerere: delay the recording of preimageJunio C Hamano2016-03-151-27/+25
| * rerere: handle leftover rr-cache/$ID directory and postimage filesJunio C Hamano2016-03-151-17/+25
| * rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_idJunio C Hamano2016-02-091-3/+29
| * rerere: split conflict ID furtherJunio C Hamano2016-02-091-5/+56
* | Merge branch 'jk/rerere-xsnprintf'Junio C Hamano2016-02-171-2/+2
|\|
| * rerere: replace strcpy with xsnprintfJeff King2016-02-081-2/+2
* | Merge branch 'jc/rerere'Junio C Hamano2015-10-051-151/+404
|\|
| * rerere: un-nest merge() furtherJunio C Hamano2015-07-251-24/+26
| * rerere: use "struct rerere_id" instead of "char *" for conflict IDJunio C Hamano2015-07-251-26/+73
| * rerere: call conflict-ids IDsJunio C Hamano2015-07-251-38/+38
| * rerere: further clarify do_rerere_one_path()Junio C Hamano2015-07-251-9/+6
| * rerere: further de-dent do_plain_rerere()Junio C Hamano2015-07-251-32/+33
| * rerere: refactor "replay" part of do_plain_rerere()Junio C Hamano2015-07-251-35/+40
| * rerere: explain the remainderJunio C Hamano2015-07-251-0/+20
| * rerere: explain "rerere forget" codepathJunio C Hamano2015-07-251-0/+24
| * rerere: explain the primary codepathJunio C Hamano2015-07-251-13/+82
| * rerere: explain MERGE_RR management helpersJunio C Hamano2015-07-251-0/+41
| * rerere: fix benign off-by-one non-bug and clarify codeJunio C Hamano2015-07-251-1/+8
| * rerere: explain the rerere I/O abstractionJunio C Hamano2015-07-251-7/+31
| * rerere: do not leak mmfile[] for a path with multiple stage #1 entriesJunio C Hamano2015-07-251-2/+4
| * rerere: stop looping unnecessarilyJunio C Hamano2015-07-251-10/+7
| * rerere: drop want_sp parameter from is_cmarker()Junio C Hamano2015-07-251-5/+22
| * rerere: report autoupdated paths only after actually updating themJunio C Hamano2015-07-251-10/+12
| * rerere: write out each record of MERGE_RR in one goJunio C Hamano2015-07-251-7/+9
| * rerere: lift PATH_MAX limitationJunio C Hamano2015-07-251-20/+15
| * rerere: plug conflict ID leaksJunio C Hamano2015-07-251-2/+5
| * rerere: handle conflicts with multiple stage #1 entriesJunio C Hamano2015-07-251-1/+1
| * rerere: fix an off-by-one non-bugJunio C Hamano2015-06-281-4/+2
| * Merge branch 'jn/rerere-fail-on-auto-update-failure' into maintJunio C Hamano2015-02-251-10/+6
| |\
* | | rerere: release lockfile in non-writing functionsJeff King2015-09-021-2/+15
* | | memoize common git-path "constant" filesJeff King2015-08-111-11/+8
* | | Merge branch 'jk/rerere-forget-check-enabled'Junio C Hamano2015-05-261-0/+2
|\ \ \
| * | | rerere: exit silently on "forget" when rerere is disabledJeff King2015-05-141-0/+2
* | | | Merge branch 'jn/rerere-fail-on-auto-update-failure'Junio C Hamano2015-02-111-10/+6
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | rerere: error out on autoupdate failureJonathan Nieder2015-01-081-10/+6
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 23:53:05 +0100