summaryrefslogtreecommitdiff
path: root/builtin/merge.c
AgeCommit message (Expand)Author
2022-01-10Merge branch 'ja/i18n-similar-messages'Junio C Hamano
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
2021-09-09merge: 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-30Merge branch 'cb/builtin-merge-format-string-fix'Junio C Hamano
2021-08-30Merge branch 'en/ort-becomes-the-default'Junio C Hamano
2021-08-30Merge branch 'en/merge-strategy-docs'Junio C Hamano
2021-08-30Merge branch 'en/pull-conflicting-options'Junio C Hamano
2021-08-25use 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-05Change 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
2021-07-26builtin/merge: free found_ref when doneAndrzej Hunt
2021-07-23merge: apply autostash if merge strategy failsPhilippe Blain
2021-07-23merge: apply autostash if fast-forward failsPhilippe Blain
2021-07-23merge: add missing word "strategy" to a messagePhilippe Blain
2021-07-21pull: abort if --ff-only is given and fast-forwarding is impossibleAlex Henrie
2021-06-10Merge branch 'ah/merge-usage-i18n-fix'Junio C Hamano
2021-05-16merge: don't translate literal commandsAlex Henrie
2021-05-03merge: fix swapped "up to date" message componentsJosh Soref
2021-05-03merge(s): apply consistent punctuation to "up to date" messagesEric Sunshine
2021-03-14use CALLOC_ARRAYRené Scharfe
2021-02-06Merge branch 'so/log-diff-merge'Junio C Hamano
2020-12-21diff-merges: new function diff_merges_suppress()Sergey Organov
2020-11-18Merge branch 'en/merge-ort-api-null-impl'Junio C Hamano
2020-11-03merge,rebase,revert: select ort or recursive by config or environmentElijah Newren
2020-10-20Documentation: stylistically normalize references to Signed-off-by:Bradley M. Kuhn
2020-09-25Merge branch 'ds/maintenance-part-1'Junio C Hamano
2020-09-17maintenance: replace run_auto_gc()Derrick Stolee
2020-09-09Merge branch 'jt/interpret-branch-name-fallback'Junio C Hamano
2020-09-02wt-status: tolerate dangling marksJonathan Tan
2020-08-21sequencer: treat CHERRY_PICK_HEAD as a pseudo refHan-Wen Nienhuys
2020-08-03merge: make merge.renormalize work for all uses of merge machineryElijah Newren