path: root/rerere.c
AgeCommit message (Expand)Author
2017-09-25Merge branch 'jk/write-in-full-fix'Junio C Hamano
2017-09-14avoid "write_in_full(fd, buf, len) != len" patternJeff King
2017-08-22rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolvedJunio C Hamano
2017-08-22rerere: represent time duration in timestamp_t internallyJunio C Hamano
2017-06-24Merge branch 'ab/free-and-null'Junio C Hamano
2017-06-24Merge branch 'bw/config-h'Junio C Hamano
2017-06-16*.[ch] refactoring: make use of the FREE_AND_NULL() macroÆvar Arnfjörð Bjarmason
2017-06-15config: don't include config.h by defaultBrandon Williams
2017-05-26rerere.c: move error_errno() closer to the source system callNguyễn Thái Ngọc Duy
2017-05-26print errno when reporting a system call errorNguyễn Thái Ngọc Duy
2017-05-26wrapper.c: add and use fopen_or_warn()Nguyễn Thái Ngọc Duy
2016-12-07hold_locked_index(): align error handling with hold_lockfile_for_update()Junio C Hamano
2016-09-07cache: convert struct cache_entry to use struct object_idbrian m. carlson
2016-05-23Merge branch 'jc/rerere-multi'Junio C Hamano
2016-05-19rerere: remove an null statementJunio C Hamano
2016-05-17Merge branch 'nd/error-errno'Junio C Hamano
2016-05-11rerere: plug memory leaks upon "rerere forget" failureJunio C Hamano
2016-05-09rerere.c: use error_errno() and warning_errno()Nguyễn Thái Ngọc Duy
2016-04-25Merge branch 'jc/rerere-multi'Junio C Hamano
2016-04-06rerere: adjust 'forget' to multi-variant world orderJunio C Hamano
2016-04-06rerere: split code to call ll_merge() furtherJunio C Hamano
2016-04-06rerere: move code related to "forget" togetherJunio C Hamano
2016-04-06rerere: gc and clearJunio C Hamano
2016-03-15rerere: do use multiple variantsJunio C Hamano
2016-03-15rerere: allow multiple variants to existJunio C Hamano
2016-03-15rerere: delay the recording of preimageJunio C Hamano
2016-03-15rerere: handle leftover rr-cache/$ID directory and postimage filesJunio C Hamano
2016-02-17Merge branch 'jk/rerere-xsnprintf'Junio C Hamano
2016-02-08rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_idJunio C Hamano
2016-02-08rerere: split conflict ID furtherJunio C Hamano
2016-02-08rerere: replace strcpy with xsnprintfJeff King
2015-10-05Merge branch 'jc/rerere'Junio C Hamano
2015-09-01rerere: release lockfile in non-writing functionsJeff King
2015-08-10memoize common git-path "constant" filesJeff King
2015-07-24rerere: un-nest merge() furtherJunio C Hamano
2015-07-24rerere: use "struct rerere_id" instead of "char *" for conflict IDJunio C Hamano
2015-07-24rerere: call conflict-ids IDsJunio C Hamano
2015-07-24rerere: further clarify do_rerere_one_path()Junio C Hamano
2015-07-24rerere: further de-dent do_plain_rerere()Junio C Hamano
2015-07-24rerere: refactor "replay" part of do_plain_rerere()Junio C Hamano
2015-07-24rerere: explain the remainderJunio C Hamano
2015-07-24rerere: explain "rerere forget" codepathJunio C Hamano
2015-07-24rerere: explain the primary codepathJunio C Hamano
2015-07-24rerere: explain MERGE_RR management helpersJunio C Hamano
2015-07-24rerere: fix benign off-by-one non-bug and clarify codeJunio C Hamano
2015-07-24rerere: explain the rerere I/O abstractionJunio C Hamano
2015-07-24rerere: do not leak mmfile[] for a path with multiple stage #1 entriesJunio C Hamano
2015-07-24rerere: stop looping unnecessarilyJunio C Hamano
2015-07-24rerere: drop want_sp parameter from is_cmarker()Junio C Hamano
2015-07-24rerere: report autoupdated paths only after actually updating themJunio C Hamano