path: root/rerere.c
AgeCommit message (Expand)Author
2022-05-20Merge branch 'ep/maint-equals-null-cocci'Junio C Hamano
2022-05-02tree-wide: apply equals-null.cocciJunio C Hamano
2022-02-02ll-merge: make callers responsible for showing warningsElijah Newren
2021-05-12dir: introduce readdir_skip_dot_and_dotdot() helperElijah Newren
2021-01-28rerere: use strmap to store rerere directoriesJeff King
2021-01-28rerere: tighten rr-cache dirname checkJeff King
2021-01-28rerere: check dirname format while iterating rr_cache directoryJeff King
2021-01-04hash-lookup: rename from sha1-lookupMartin Ågren
2021-01-04sha1-lookup: rename `sha1_pos()` as `hash_pos()`Martin Ågren
2019-11-10Fix spelling errors in code commentsElijah Newren
2019-08-19rerere: replace sha1_to_hexbrian m. carlson
2019-01-14read-cache.c: kill read_index()Nguyễn Thái Ngọc Duy
2019-01-14repository.c: replace hold_locked_index() with repo_hold_locked_index()Nguyễn Thái Ngọc Duy
2018-11-12rerere.c: remove the_repository referencesNguyễn Thái Ngọc Duy
2018-10-30Merge branch 'bc/hash-transition-part-15'Junio C Hamano
2018-10-19Merge branch 'nd/the-index'Junio C Hamano
2018-10-15rerere: convert to use the_hash_algobrian m. carlson
2018-09-24Merge branch 'en/rerere-multi-stage-1-fix'Junio C Hamano
2018-09-21rerere.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-21ll-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-17Merge branch 'tg/rerere'Junio C Hamano
2018-09-11rerere: avoid buffer overrunElijah Newren
2018-08-13dir.c: remove an implicit dependency on the_index in pathspec codeNguyễn Thái Ngọc Duy
2018-08-06rerere: recalculate conflict ID when unresolved conflict is committedThomas Gummerer
2018-08-06rerere: teach rerere to handle nested conflictsThomas Gummerer
2018-08-06rerere: return strbuf from handle pathThomas Gummerer
2018-08-06rerere: factor out handle_conflict functionThomas Gummerer
2018-08-06rerere: only return whether a path has conflicts or notThomas Gummerer
2018-08-06rerere: fix crash with files rerere can't handleThomas Gummerer
2018-08-06rerere: add documentation for conflict normalizationThomas Gummerer
2018-08-06rerere: mark strings for translationThomas Gummerer
2018-07-18Merge branch 'sb/object-store-grafts'Junio C Hamano
2018-07-16rerere: wrap paths in output in sqThomas Gummerer
2018-07-16rerere: lowercase error messagesThomas Gummerer
2018-07-16rerere: unify error messages when read_cache failsThomas Gummerer
2018-05-30Merge branch 'ma/lockfile-cleanup'Junio C Hamano
2018-05-17path.c: migrate global git_path_* to take a repository argumentStefan Beller
2018-05-16object-store: move object access functions to object-store.hStefan Beller
2018-05-10lock_file: move static locks into functionsMartin Ågren
2018-04-09Merge branch 'bc/object-id'Junio C Hamano
2018-03-14sha1_file: convert read_sha1_file to struct object_idbrian m. carlson
2018-03-01write_locked_index(): add flag to avoid writing unchanged indexMartin Ågren
2018-01-22Use MOVE_ARRAYSZEDER Gábor
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