summary refs log tree commit diff
path: root/rerere.c
AgeCommit message (Expand)AuthorFilesLines
2022-02-02ll-merge: make callers responsible for showing warningsElijah Newren1-4/+5
2021-05-13dir: introduce readdir_skip_dot_and_dotdot() helperElijah Newren1-3/+1
2021-01-28rerere: use strmap to store rerere directoriesJeff King1-39/+23
2021-01-28rerere: tighten rr-cache dirname checkJeff King1-2/+3
2021-01-28rerere: check dirname format while iterating rr_cache directoryJeff King1-3/+11
2021-01-04hash-lookup: rename from sha1-lookupMartin Ågren1-1/+1
2021-01-04sha1-lookup: rename `sha1_pos()` as `hash_pos()`Martin Ågren1-1/+1
2019-11-10Fix spelling errors in code commentsElijah Newren1-1/+1
2019-08-19rerere: replace sha1_to_hexbrian m. carlson1-4/+4
2019-01-14read-cache.c: kill read_index()Nguyễn Thái Ngọc Duy1-3/+3
2019-01-14repository.c: replace hold_locked_index() with repo_hold_locked_index()Nguyễn Thái Ngọc Duy1-1/+1
2018-11-12rerere.c: remove the_repository referencesNguyễn Thái Ngọc Duy1-13/+13
2018-10-30Merge branch 'bc/hash-transition-part-15'Junio C Hamano1-41/+44
2018-10-19Merge branch 'nd/the-index'Junio C Hamano1-55/+66
2018-10-15rerere: convert to use the_hash_algobrian m. carlson1-39/+42
2018-09-24Merge branch 'en/rerere-multi-stage-1-fix'Junio C Hamano1-1/+1
2018-09-21rerere.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-55/+64
2018-09-21ll-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-4/+6
2018-09-17Merge branch 'tg/rerere'Junio C Hamano1-127/+116
2018-09-11rerere: avoid buffer overrunElijah Newren1-1/+1
2018-08-13dir.c: remove an implicit dependency on the_index in pathspec codeNguyễn Thái Ngọc Duy1-1/+1
2018-08-06rerere: recalculate conflict ID when unresolved conflict is committedThomas Gummerer1-4/+3
2018-08-06rerere: teach rerere to handle nested conflictsThomas Gummerer1-2/+8
2018-08-06rerere: return strbuf from handle pathThomas Gummerer1-40/+18
2018-08-06rerere: factor out handle_conflict functionThomas Gummerer1-40/+47
2018-08-06rerere: only return whether a path has conflicts or notThomas Gummerer1-11/+12
2018-08-06rerere: fix crash with files rerere can't handleThomas Gummerer1-5/+7
2018-08-06rerere: add documentation for conflict normalizationThomas Gummerer1-4/+0
2018-08-06rerere: mark strings for translationThomas Gummerer1-34/+34
2018-07-18Merge branch 'sb/object-store-grafts'Junio C Hamano1-3/+5
2018-07-16rerere: wrap paths in output in sqThomas Gummerer1-13/+13
2018-07-16rerere: lowercase error messagesThomas Gummerer1-12/+12
2018-07-16rerere: unify error messages when read_cache failsThomas Gummerer1-3/+3
2018-05-30Merge branch 'ma/lockfile-cleanup'Junio C Hamano1-2/+1
2018-05-18path.c: migrate global git_path_* to take a repository argumentStefan Beller1-3/+4
2018-05-16object-store: move object access functions to object-store.hStefan Beller1-0/+1
2018-05-10lock_file: move static locks into functionsMartin Ågren1-2/+1
2018-04-10Merge branch 'bc/object-id'Junio C Hamano1-2/+2
2018-03-14sha1_file: convert read_sha1_file to struct object_idbrian m. carlson1-2/+2
2018-03-01write_locked_index(): add flag to avoid writing unchanged indexMartin Ågren1-5/+3
2018-01-22Use MOVE_ARRAYSZEDER Gábor1-2/+2
2017-09-25Merge branch 'jk/write-in-full-fix'Junio C Hamano1-1/+1
2017-09-14avoid "write_in_full(fd, buf, len) != len" patternJeff King1-1/+1
2017-08-22rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolvedJunio C Hamano1-12/+2
2017-08-22rerere: represent time duration in timestamp_t internallyJunio C Hamano1-13/+23
2017-06-24Merge branch 'ab/free-and-null'Junio C Hamano1-2/+1
2017-06-24Merge branch 'bw/config-h'Junio C Hamano1-0/+1
2017-06-16*.[ch] refactoring: make use of the FREE_AND_NULL() macroÆvar Arnfjörð Bjarmason1-2/+1
2017-06-15config: don't include config.h by defaultBrandon Williams1-0/+1
2017-05-26rerere.c: move error_errno() closer to the source system callNguyễn Thái Ngọc Duy1-1/+2
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-05-20 12:21:17 +0000