summaryrefslogtreecommitdiffstats
path: root/rerere.c (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * ll-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-4/+6
* | Merge branch 'en/rerere-multi-stage-1-fix'Junio C Hamano2018-09-241-1/+1
|\ \
| * | rerere: avoid buffer overrunElijah Newren2018-09-111-1/+1
* | | Merge branch 'tg/rerere'Junio C Hamano2018-09-171-127/+116
|\ \ \ | |_|/ |/| |
| * | rerere: recalculate conflict ID when unresolved conflict is committedThomas Gummerer2018-08-061-4/+3
| * | rerere: teach rerere to handle nested conflictsThomas Gummerer2018-08-061-2/+8
| * | rerere: return strbuf from handle pathThomas Gummerer2018-08-061-40/+18
| * | rerere: factor out handle_conflict functionThomas Gummerer2018-08-061-40/+47
| * | rerere: only return whether a path has conflicts or notThomas Gummerer2018-08-061-11/+12
| * | rerere: fix crash with files rerere can't handleThomas Gummerer2018-08-061-5/+7
| * | rerere: add documentation for conflict normalizationThomas Gummerer2018-08-061-4/+0
| * | rerere: mark strings for translationThomas Gummerer2018-08-061-34/+34
| * | rerere: wrap paths in output in sqThomas Gummerer2018-07-161-13/+13
| * | rerere: lowercase error messagesThomas Gummerer2018-07-161-12/+12
| * | rerere: unify error messages when read_cache failsThomas Gummerer2018-07-161-3/+3
* | | dir.c: remove an implicit dependency on the_index in pathspec codeNguyễn Thái Ngọc Duy2018-08-131-1/+1
* | | Merge branch 'sb/object-store-grafts'Junio C Hamano2018-07-181-3/+5
|\ \ \ | |/ / |/| |
| * | path.c: migrate global git_path_* to take a repository argumentStefan Beller2018-05-181-3/+4
| * | object-store: move object access functions to object-store.hStefan Beller2018-05-161-0/+1
* | | Merge branch 'ma/lockfile-cleanup'Junio C Hamano2018-05-301-2/+1
|\ \ \ | |/ / |/| |
| * | lock_file: move static locks into functionsMartin Ågren2018-05-101-2/+1
| |/
* | Merge branch 'bc/object-id'Junio C Hamano2018-04-101-2/+2
|\ \ | |/ |/|
| * sha1_file: convert read_sha1_file to struct object_idbrian m. carlson2018-03-141-2/+2
* | write_locked_index(): add flag to avoid writing unchanged indexMartin Ågren2018-03-011-5/+3
|/
* Use MOVE_ARRAYSZEDER Gábor2018-01-221-2/+2
* 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.rerereUnresolvedJunio 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 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 20:16:21 +0100