summaryrefslogtreecommitdiff
path: root/rerere.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/write-in-full-fix'Junio C Hamano2017-09-251-1/+1
|\
| * avoid "write_in_full(fd, buf, len) != len" patternJeff King2017-09-141-1/+1
* | rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolvedjc/cutoff-configJunio C Hamano2017-08-221-12/+2
* | rerere: represent time duration in timestamp_t internallyJunio C Hamano2017-08-221-13/+23
|/
* Merge branch 'ab/free-and-null'Junio C Hamano2017-06-241-2/+1
|\
| * *.[ch] refactoring: make use of the FREE_AND_NULL() macroÆvar Arnfjörð Bjarmason2017-06-161-2/+1
* | Merge branch 'bw/config-h'Junio C Hamano2017-06-241-0/+1
|\ \ | |/ |/|
| * config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
* | rerere.c: move error_errno() closer to the source system callNguyễn Thái Ngọc Duy2017-05-261-1/+2
* | print errno when reporting a system call errorNguyễn Thái Ngọc Duy2017-05-261-2/+2
* | 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 statementjc/rerere-multiJunio C Hamano2016-05-191-1/+1
| * rerere: plug memory leaks upon "rerere forget" failureJunio C Hamano2016-05-111-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-251-194/+432
|\ \ \ | |/ / |/| / | |/
| * rerere: adjust 'forget' to multi-variant world orderJunio C Hamano2016-04-061-1/+27
| * rerere: split code to call ll_merge() furtherJunio C Hamano2016-04-061-16/+31
| * rerere: move code related to "forget" togetherJunio C Hamano2016-04-061-97/+97
| * rerere: gc and clearJunio C Hamano2016-04-061-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-081-3/+29
| * rerere: split conflict ID furtherJunio C Hamano2016-02-081-5/+56
* | Merge branch 'jk/rerere-xsnprintf'Junio C Hamano2016-02-171-2/+2
|\ \ | |/
| * rerere: replace strcpy with xsnprintfjk/rerere-xsnprintfJeff King2016-02-081-2/+2
* | Merge branch 'jc/rerere'Junio C Hamano2015-10-051-151/+404
|\ \ | |/
| * rerere: un-nest merge() furtherjc/rerereJunio C Hamano2015-07-241-24/+26
| * rerere: use "struct rerere_id" instead of "char *" for conflict IDJunio C Hamano2015-07-241-26/+73
| * rerere: call conflict-ids IDsJunio C Hamano2015-07-241-38/+38
| * rerere: further clarify do_rerere_one_path()Junio C Hamano2015-07-241-9/+6
| * rerere: further de-dent do_plain_rerere()Junio C Hamano2015-07-241-32/+33
| * rerere: refactor "replay" part of do_plain_rerere()Junio C Hamano2015-07-241-35/+40
| * rerere: explain the remainderJunio C Hamano2015-07-241-0/+20
| * rerere: explain "rerere forget" codepathJunio C Hamano2015-07-241-0/+24
| * rerere: explain the primary codepathJunio C Hamano2015-07-241-13/+82
| * rerere: explain MERGE_RR management helpersJunio C Hamano2015-07-241-0/+41
| * rerere: fix benign off-by-one non-bug and clarify codeJunio C Hamano2015-07-241-1/+8
| * rerere: explain the rerere I/O abstractionJunio C Hamano2015-07-241-7/+31
| * rerere: do not leak mmfile[] for a path with multiple stage #1 entriesJunio C Hamano2015-07-241-2/+4
| * rerere: stop looping unnecessarilyJunio C Hamano2015-07-241-10/+7
| * rerere: drop want_sp parameter from is_cmarker()Junio C Hamano2015-07-241-5/+22
| * rerere: report autoupdated paths only after actually updating themJunio C Hamano2015-07-241-10/+12
| * rerere: write out each record of MERGE_RR in one goJunio C Hamano2015-07-241-7/+9
| * rerere: lift PATH_MAX limitationJunio C Hamano2015-07-241-20/+15
View Lorry Controller Status