summaryrefslogtreecommitdiff
path: root/builtin/merge.c
AgeCommit message (Expand)Author
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-07hooks: fix an obscure TOCTOU "did we just run a hook?" raceÆvar Arnfjörð Bjarmason
2022-03-07merge: don't run post-hook logic on --no-verifyÆvar Arnfjörð Bjarmason
2022-02-18Merge branch 'pw/use-in-process-checkout-in-rebase'Junio C Hamano
2022-02-09Merge branch 'en/plug-leaks-in-merge'Junio C Hamano
2022-02-09Merge branch 'ab/config-based-hooks-2'Junio C Hamano
2022-01-26create_autostash(): remove unneeded parameterPhillip Wood
2022-01-21merge: fix memory leaks in cmd_merge()Elijah Newren
2022-01-10Merge branch 'ja/i18n-similar-messages'Junio C Hamano
2022-01-07merge: convert post-merge to use hook.hEmily Shaffer
2022-01-05Merge branch 'jc/merge-detached-head-name'Junio C Hamano
2022-01-05i18n: turn "options are incompatible" into "cannot be used together"Jean-Noël Avila
2021-12-20merge: allow to pretend a merge is made into a different branchJunio C Hamano
2021-11-26run-command API users: use strvec_pushl(), not argv constructionÆvar Arnfjörð Bjarmason
2021-10-25Merge branch 'ab/mark-leak-free-tests-more'Junio C Hamano
2021-10-13Merge branch 'ab/config-based-hooks-1'Junio C Hamano
2021-10-13Merge branch 'en/removing-untracked-fixes'Junio C Hamano
2021-10-07merge: add missing strbuf_release()Ævar Arnfjörð Bjarmason
2021-09-27Remove ignored files by default when they are in the wayElijah Newren
2021-09-27unpack-trees: introduce preserve_ignored to unpack_trees_optionsElijah Newren
2021-09-27hook.c users: use "hook_exists()" instead of "find_hook()"Ævar Arnfjörð Bjarmason
2021-09-27hook.[ch]: move find_hook() from run-command.c to hook.cÆvar Arnfjörð Bjarmason
2021-09-20Merge branch 'js/run-command-close-packs'Junio C Hamano
2021-09-20Merge branch 'ds/mergies-with-sparse-index'Junio C Hamano
2021-09-10Merge branch 'ab/retire-advice-config'Junio C Hamano