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
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
2022-02-19Merge branch 'pw/use-in-process-checkout-in-rebase'Junio C Hamano
2022-02-10Merge branch 'en/plug-leaks-in-merge'Junio C Hamano
2022-02-10Merge branch 'ab/config-based-hooks-2'Junio C Hamano
2022-01-26create_autostash(): remove unneeded parameterPhillip Wood
2022-01-22merge: fix memory leaks in cmd_merge()Elijah Newren
2022-01-10Merge branch 'ja/i18n-similar-messages'Junio C Hamano
2022-01-08merge: convert post-merge to use hook.hEmily Shaffer
2022-01-06Merge branch 'jc/merge-detached-head-name'Junio C Hamano
2022-01-06i18n: turn "options are incompatible" into "cannot be used together"Jean-Noël Avila
2021-12-21merge: 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-26Merge branch 'ab/mark-leak-free-tests-more'Junio C Hamano
2021-10-14Merge branch 'ab/config-based-hooks-1'Junio C Hamano
2021-10-14Merge branch 'en/removing-untracked-fixes'Junio C Hamano
2021-10-08merge: 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-21Merge branch 'js/run-command-close-packs'Junio C Hamano
2021-09-21Merge branch 'ds/mergies-with-sparse-index'Junio C Hamano
2021-09-10Merge branch 'ab/retire-advice-config'Junio C Hamano
2021-09-10merge: make sparse-aware with ORTDerrick Stolee
2021-09-09run_auto_maintenance(): implicitly close the object storeJohannes Schindelin
2021-09-08Merge branch 'rs/xopen-reports-open-failures'Junio C Hamano
2021-08-31Merge branch 'cb/builtin-merge-format-string-fix'Junio C Hamano
2021-08-31Merge branch 'en/ort-becomes-the-default'Junio C Hamano
2021-08-31Merge branch 'en/merge-strategy-docs'Junio C Hamano
2021-08-31Merge branch 'en/pull-conflicting-options'Junio C Hamano
2021-08-26use xopen() to handle fatal open(2) failuresRené Scharfe
2021-08-25advice: remove read uses of most global `advice_` variablesBen Boeckel
2021-08-09builtin/merge: avoid -Wformat-extra-args from ancient XcodeCarlo Marcelo Arenas Belón
2021-08-06Change default merge backend from recursive to ortElijah Newren
2021-08-05Update error message and code commentElijah Newren
2021-08-04Merge branch 'pb/merge-autostash-more'Junio C Hamano
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-25 13:13:08 +0300