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/builtin/merge.c
AgeCommit message (Expand)Author
2023-06-12strbuf: remove global variableCalvin Wan
2023-04-11editor: move editor-related functions and declarations into common fileElijah Newren
2023-04-11object-name.h: move declarations for object-name.c functions from cache.hElijah Newren
2023-04-11treewide: be explicit about dependence on advice.hElijah Newren
2023-04-04Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano
2023-03-28cocci: apply the "refs.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason
2023-03-28cocci: apply the "commit.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason
2023-03-28cocci: apply the "commit-reach.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason
2023-03-28cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason
2023-03-21wrapper.h: move declarations for wrapper.c functions from cache.hElijah Newren
2023-03-21abspath.h: move absolute path functions from cache.hElijah Newren
2023-03-21environment: move comment_line_char from cache.hElijah Newren
2023-03-21treewide: be explicit about dependence on gettext.hElijah Newren
2023-03-18Merge branch 'jc/gpg-lazy-init'Junio C Hamano
2023-02-24cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren
2023-02-24alloc.h: move ALLOC_GROW() functions from cache.hElijah Newren
2023-02-23Merge branch 'ab/various-leak-fixes'Junio C Hamano
2023-02-10cocci & cache.h: remove "USE_THE_INDEX_COMPATIBILITY_MACROS"Ævar Arnfjörð Bjarmason
2023-02-10cocci & cache-tree.h: migrate "write_cache_as_tree" to "*_index_*"Ævar Arnfjörð Bjarmason
2023-02-10gpg-interface: lazily initialize and read the configurationJunio C Hamano
2023-02-07builtin/merge.c: free "&buf" on "Your local changes..." errorÆvar Arnfjörð Bjarmason
2023-02-07builtin/merge.c: use fixed strings, not "strbuf", fix leakÆvar Arnfjörð Bjarmason
2023-01-13merge: break out of all_strategy loop when strategy is foundSeija Kijin
2022-12-26Merge branch 'jk/unused-post-2.39'Junio C Hamano
2022-12-14Merge branch 'ab/various-leak-fixes'Junio C Hamano
2022-12-13diff: mark unused parameters in callbacksJeff King
2022-11-21{reset,merge}: call discard_index() before returningÆvar Arnfjörð Bjarmason
2022-11-21cocci: apply "pending" index-compatibility to some "builtin/*.c"Ævar Arnfjörð Bjarmason
2022-11-21cocci & cache.h: apply variable section of "pending" index-compatibilityÆvar Arnfjörð Bjarmason
2022-11-21cocci & cache.h: apply a selection of "pending" index-compatibilityÆvar Arnfjörð Bjarmason
2022-11-21read-cache API & users: make discard_index() return voidÆvar Arnfjörð Bjarmason
2022-11-21cocci & cache.h: remove rarely used "the_index" compat macrosÆvar Arnfjörð Bjarmason
2022-10-30use child_process members "args" and "env" directlyRené Scharfe
2022-10-30use child_process member "args" instead of string array variableRené Scharfe
2022-10-30merge: remove always-the-same "verbose" argumentsÆvar Arnfjörð Bjarmason
2022-09-01Merge branch 'en/merge-multi-strategies'Junio C Hamano
2022-09-01Merge branch 'en/merge-unstash-only-on-clean-merge'Junio C Hamano
2022-08-24merge: small code readability improvementElijah Newren
2022-08-24merge: cleanup confusing logic for handling successful mergesElijah Newren
2022-08-24merge: only apply autostash when appropriateElijah Newren
2022-07-23merge: do not exit restore_state() prematurelyElijah Newren
2022-07-23merge: ensure we can actually restore pre-merge stateElijah Newren
2022-07-23merge: make restore_state() restore staged state tooElijah Newren
2022-07-23merge: fix save_state() to work when there are stat-dirty filesElijah Newren
2022-07-23merge: do not abort early if one strategy fails to handle the mergeElijah Newren
2022-07-23merge: abort if index does not match HEAD for trivial mergesElijah Newren
2022-07-06cocci: add and apply a rule to find "unused" strbufsÆvar Arnfjörð Bjarmason
2022-04-14revisions API users: add straightforward release_revisions()Ævar Arnfjörð Bjarmason
2022-03-08hooks: fix an obscure TOCTOU "did we just run a hook?" raceÆvar Arnfjörð Bjarmason
2022-03-08merge: don't run post-hook logic on --no-verifyÆvar Arnfjörð Bjarmason
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-29 16:40:50 +0300