summaryrefslogtreecommitdiff
path: root/rerere.c
AgeCommit message (Expand)AuthorFilesLines
2018-05-30Merge branch 'ma/lockfile-cleanup'Libravatar Junio C Hamano1-2/+1
2018-05-10lock_file: move static locks into functionsLibravatar Martin Ågren1-2/+1
2018-04-10Merge branch 'bc/object-id'Libravatar Junio C Hamano1-2/+2
2018-03-14sha1_file: convert read_sha1_file to struct object_idLibravatar brian m. carlson1-2/+2
2018-03-01write_locked_index(): add flag to avoid writing unchanged indexLibravatar Martin Ågren1-5/+3
2018-01-22Use MOVE_ARRAYLibravatar SZEDER Gábor1-2/+2
2017-09-25Merge branch 'jk/write-in-full-fix'Libravatar Junio C Hamano1-1/+1
2017-09-14avoid "write_in_full(fd, buf, len) != len" patternLibravatar Jeff King1-1/+1
2017-08-22rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolvedLibravatar Junio C Hamano1-12/+2
2017-08-22rerere: represent time duration in timestamp_t internallyLibravatar Junio C Hamano1-13/+23
2017-06-24Merge branch 'ab/free-and-null'Libravatar Junio C Hamano1-2/+1
2017-06-24Merge branch 'bw/config-h'Libravatar Junio C Hamano1-0/+1
2017-06-16*.[ch] refactoring: make use of the FREE_AND_NULL() macroLibravatar Ævar Arnfjörð Bjarmason1-2/+1
2017-06-15config: don't include config.h by defaultLibravatar Brandon Williams1-0/+1
2017-05-26rerere.c: move error_errno() closer to the source system callLibravatar Nguyễn Thái Ngọc Duy1-1/+2
2017-05-26print errno when reporting a system call errorLibravatar Nguyễn Thái Ngọc Duy1-2/+2
2017-05-26wrapper.c: add and use fopen_or_warn()Libravatar Nguyễn Thái Ngọc Duy1-1/+1
2016-12-07hold_locked_index(): align error handling with hold_lockfile_for_update()Libravatar Junio C Hamano1-1/+1
2016-09-07cache: convert struct cache_entry to use struct object_idLibravatar brian m. carlson1-1/+2
2016-05-23Merge branch 'jc/rerere-multi'Libravatar Junio C Hamano1-8/+17
2016-05-19rerere: remove an null statementLibravatar Junio C Hamano1-1/+1
2016-05-17Merge branch 'nd/error-errno'Libravatar Junio C Hamano1-11/+7
2016-05-11rerere: plug memory leaks upon "rerere forget" failureLibravatar Junio C Hamano1-8/+17
2016-05-09rerere.c: use error_errno() and warning_errno()Libravatar Nguyễn Thái Ngọc Duy1-11/+7
2016-04-25Merge branch 'jc/rerere-multi'Libravatar Junio C Hamano1-194/+432
2016-04-06rerere: adjust 'forget' to multi-variant world orderLibravatar Junio C Hamano1-1/+27
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 11:21:06 +0000