aboutsummaryrefslogtreecommitdiff
path: root/rerere.c
Commit message (Expand)AuthorAge
* hold_locked_index(): align error handling with hold_lockfile_for_update()Junio C Hamano2016-12-07
* cache: convert struct cache_entry to use struct object_idbrian m. carlson2016-09-07
* Merge branch 'jc/rerere-multi'Junio C Hamano2016-05-23
|\
| * rerere: remove an null statementJunio C Hamano2016-05-19
| * rerere: plug memory leaks upon "rerere forget" failureJunio C Hamano2016-05-11
* | Merge branch 'nd/error-errno'Junio C Hamano2016-05-17
|\ \
| * | rerere.c: use error_errno() and warning_errno()Nguyễn Thái Ngọc Duy2016-05-09
* | | Merge branch 'jc/rerere-multi'Junio C Hamano2016-04-25
|\ \ \ | |/ / |/| / | |/
| * rerere: adjust 'forget' to multi-variant world orderJunio C Hamano2016-04-06
| * rerere: split code to call ll_merge() furtherJunio C Hamano2016-04-06
| * rerere: move code related to "forget" togetherJunio C Hamano2016-04-06
| * rerere: gc and clearJunio C Hamano2016-04-06
| * rerere: do use multiple variantsJunio C Hamano2016-03-15
| * rerere: allow multiple variants to existJunio C Hamano2016-03-15
| * rerere: delay the recording of preimageJunio C Hamano2016-03-15
| * rerere: handle leftover rr-cache/$ID directory and postimage filesJunio C Hamano2016-03-15
| * rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_idJunio C Hamano2016-02-08
| * rerere: split conflict ID furtherJunio C Hamano2016-02-08
* | Merge branch 'jk/rerere-xsnprintf'Junio C Hamano2016-02-17
|\ \ | |/
| * rerere: replace strcpy with xsnprintfJeff King2016-02-08
* | Merge branch 'jc/rerere'Junio C Hamano2015-10-05
|\ \ | |/
| * rerere: un-nest merge() furtherJunio C Hamano2015-07-24
| * rerere: use "struct rerere_id" instead of "char *" for conflict IDJunio C Hamano2015-07-24
| * rerere: call conflict-ids IDsJunio C Hamano2015-07-24
| * rerere: further clarify do_rerere_one_path()Junio C Hamano2015-07-24
| * rerere: further de-dent do_plain_rerere()Junio C Hamano2015-07-24
| * rerere: refactor "replay" part of do_plain_rerere()Junio C Hamano2015-07-24
| * rerere: explain the remainderJunio C Hamano2015-07-24
| * rerere: explain "rerere forget" codepathJunio C Hamano2015-07-24
| * rerere: explain the primary codepathJunio C Hamano2015-07-24
| * rerere: explain MERGE_RR management helpersJunio C Hamano2015-07-24
| * rerere: fix benign off-by-one non-bug and clarify codeJunio C Hamano2015-07-24
| * rerere: explain the rerere I/O abstractionJunio C Hamano2015-07-24
| * rerere: do not leak mmfile[] for a path with multiple stage #1 entriesJunio C Hamano2015-07-24
| * rerere: stop looping unnecessarilyJunio C Hamano2015-07-24
| * rerere: drop want_sp parameter from is_cmarker()Junio C Hamano2015-07-24
| * rerere: report autoupdated paths only after actually updating themJunio C Hamano2015-07-24
| * rerere: write out each record of MERGE_RR in one goJunio C Hamano2015-07-24
| * rerere: lift PATH_MAX limitationJunio C Hamano2015-07-24
| * rerere: plug conflict ID leaksJunio C Hamano2015-07-24
| * rerere: handle conflicts with multiple stage #1 entriesJunio C Hamano2015-07-24
| * rerere: fix an off-by-one non-bugJunio C Hamano2015-06-28
| * Merge branch 'jn/rerere-fail-on-auto-update-failure' into maintJunio C Hamano2015-02-24
| |\
* | | rerere: release lockfile in non-writing functionsJeff King2015-09-01
* | | memoize common git-path "constant" filesJeff King2015-08-10
* | | Merge branch 'jk/rerere-forget-check-enabled'Junio C Hamano2015-05-26
|\ \ \
| * | | rerere: exit silently on "forget" when rerere is disabledJeff King2015-05-14
* | | | Merge branch 'jn/rerere-fail-on-auto-update-failure'Junio C Hamano2015-02-11
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | rerere: error out on autoupdate failureJonathan Nieder2015-01-08
* | | lockfile.h: extract new header file for the functions in lockfile.cMichael Haggerty2014-10-01
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-18 03:53:51 +0000