Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/rerere.c
AgeCommit message (Expand)Author
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-17rerere: wrap paths in output in sqThomas Gummerer
2018-07-17rerere: lowercase error messagesThomas Gummerer
2018-07-17rerere: unify error messages when read_cache failsThomas Gummerer
2018-05-30Merge branch 'ma/lockfile-cleanup'Junio C Hamano
2018-05-18path.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-10Merge branch 'bc/object-id'Junio C Hamano
2018-03-14sha1_file: convert read_sha1_file to struct object_idbrian m. carlson
2018-03-02write_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-23rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolvedJunio C Hamano
2017-08-23rerere: represent time duration in timestamp_t internallyJunio C Hamano
2017-06-25Merge branch 'ab/free-and-null'Junio C Hamano
2017-06-25Merge branch 'bw/config-h'Junio C Hamano
2017-06-16*.[ch] refactoring: make use of the FREE_AND_NULL() macroÆvar Arnfjörð Bjarmason
2017-06-15config: don't include config.h by defaultBrandon Williams
2017-05-26rerere.c: move error_errno() closer to the source system callNguyễn Thái Ngọc Duy
2017-05-26print errno when reporting a system call errorNguyễn Thái Ngọc Duy
2017-05-26wrapper.c: add and use fopen_or_warn()Nguyễn Thái Ngọc Duy
2016-12-07hold_locked_index(): align error handling with hold_lockfile_for_update()Junio C Hamano
2016-09-07cache: convert struct cache_entry to use struct object_idbrian m. carlson
2016-05-24Merge branch 'jc/rerere-multi'Junio C Hamano
2016-05-19rerere: remove an null statementJunio C Hamano
2016-05-18Merge branch 'nd/error-errno'Junio C Hamano
2016-05-12rerere: plug memory leaks upon "rerere forget" failureJunio C Hamano
2016-05-09rerere.c: use error_errno() and warning_errno()Nguyễn Thái Ngọc Duy
2016-04-26Merge branch 'jc/rerere-multi'Junio C Hamano
2016-04-07rerere: adjust 'forget' to multi-variant world orderJunio C Hamano
2016-04-07rerere: split code to call ll_merge() furtherJunio C Hamano
2016-04-07rerere: move code related to "forget" togetherJunio C Hamano
2016-04-07rerere: gc and clearJunio C Hamano
2016-03-16rerere: do use multiple variantsJunio C Hamano
2016-03-16rerere: allow multiple variants to existJunio C Hamano
2016-03-16rerere: delay the recording of preimageJunio C Hamano
2016-03-16rerere: handle leftover rr-cache/$ID directory and postimage filesJunio C Hamano
2016-02-17Merge branch 'jk/rerere-xsnprintf'Junio C Hamano
2016-02-09rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_idJunio C Hamano
2016-02-09rerere: split conflict ID furtherJunio C Hamano
2016-02-09rerere: replace strcpy with xsnprintfJeff King
2015-10-05Merge branch 'jc/rerere'Junio C Hamano
2015-09-02rerere: release lockfile in non-writing functionsJeff King
2015-08-11memoize common git-path "constant" filesJeff King
2015-07-25rerere: un-nest merge() furtherJunio C Hamano
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-14 18:28:31 +0300