summaryrefslogtreecommitdiff
path: root/builtin/merge.c
AgeCommit message (Expand)AuthorFilesLines
2021-11-25run-command API users: use strvec_pushl(), not argv constructionLibravatar Ævar Arnfjörð Bjarmason1-2/+1
2021-10-25Merge branch 'ab/mark-leak-free-tests-more'Libravatar Junio C Hamano1-0/+2
2021-10-13Merge branch 'ab/config-based-hooks-1'Libravatar Junio C Hamano1-1/+2
2021-10-13Merge branch 'en/removing-untracked-fixes'Libravatar Junio C Hamano1-0/+1
2021-10-07merge: add missing strbuf_release()Libravatar Ævar Arnfjörð Bjarmason1-0/+2
2021-09-27Remove ignored files by default when they are in the wayLibravatar Elijah Newren1-2/+1
2021-09-27unpack-trees: introduce preserve_ignored to unpack_trees_optionsLibravatar Elijah Newren1-0/+2
2021-09-27hook.c users: use "hook_exists()" instead of "find_hook()"Libravatar Ævar Arnfjörð Bjarmason1-1/+1
2021-09-27hook.[ch]: move find_hook() from run-command.c to hook.cLibravatar Ævar Arnfjörð Bjarmason1-0/+1
2021-09-20Merge branch 'js/run-command-close-packs'Libravatar Junio C Hamano1-1/+0
2021-09-20Merge branch 'ds/mergies-with-sparse-index'Libravatar Junio C Hamano1-0/+3
2021-09-10Merge branch 'ab/retire-advice-config'Libravatar Junio C Hamano1-2/+2
2021-09-09merge: make sparse-aware with ORTLibravatar Derrick Stolee1-0/+3
2021-09-09run_auto_maintenance(): implicitly close the object storeLibravatar Johannes Schindelin1-1/+0
2021-09-08Merge branch 'rs/xopen-reports-open-failures'Libravatar Junio C Hamano1-3/+1
2021-08-30Merge branch 'cb/builtin-merge-format-string-fix'Libravatar Junio C Hamano1-3/+5
2021-08-30Merge branch 'en/ort-becomes-the-default'Libravatar Junio C Hamano1-2/+8
2021-08-30Merge branch 'en/merge-strategy-docs'Libravatar Junio C Hamano1-1/+1
2021-08-30Merge branch 'en/pull-conflicting-options'Libravatar Junio C Hamano1-1/+1
2021-08-25use xopen() to handle fatal open(2) failuresLibravatar René Scharfe1-3/+1
2021-08-25advice: remove read uses of most global `advice_` variablesLibravatar Ben Boeckel1-2/+2
2021-08-09builtin/merge: avoid -Wformat-extra-args from ancient XcodeLibravatar Carlo Marcelo Arenas Belón1-3/+5
2021-08-05Change default merge backend from recursive to ortLibravatar Elijah Newren1-2/+8
2021-08-05Update error message and code commentLibravatar Elijah Newren1-1/+1
2021-08-04Merge branch 'pb/merge-autostash-more'Libravatar Junio C Hamano1-1/+3
2021-07-26builtin/merge: free found_ref when doneLibravatar Andrzej Hunt1-1/+2
2021-07-23merge: apply autostash if merge strategy failsLibravatar Philippe Blain1-0/+1
2021-07-23merge: apply autostash if fast-forward failsLibravatar Philippe Blain1-0/+1
2021-07-23merge: add missing word "strategy" to a messageLibravatar Philippe Blain1-1/+1
2021-07-20pull: abort if --ff-only is given and fast-forwarding is impossibleLibravatar Alex Henrie1-1/+1
2021-06-10Merge branch 'ah/merge-usage-i18n-fix'Libravatar Junio C Hamano1-2/+2
2021-05-16merge: don't translate literal commandsLibravatar Alex Henrie1-2/+2
2021-05-03merge: fix swapped "up to date" message componentsLibravatar Josh Soref1-5/+9
2021-05-03merge(s): apply consistent punctuation to "up to date" messagesLibravatar Eric Sunshine1-1/+1
2021-03-13use CALLOC_ARRAYLibravatar René Scharfe1-1/+1
2021-02-05Merge branch 'so/log-diff-merge'Libravatar Junio C Hamano1-1/+2
2020-12-21diff-merges: new function diff_merges_suppress()Libravatar Sergey Organov1-1/+2
2020-11-18Merge branch 'en/merge-ort-api-null-impl'Libravatar Junio C Hamano1-3/+23
2020-11-02merge,rebase,revert: select ort or recursive by config or environmentLibravatar Elijah Newren1-3/+23
2020-10-20Documentation: stylistically normalize references to Signed-off-by:Libravatar Bradley M. Kuhn1-1/+1
2020-09-25Merge branch 'ds/maintenance-part-1'Libravatar Junio C Hamano1-1/+1
2020-09-17maintenance: replace run_auto_gc()Libravatar Derrick Stolee1-1/+1
2020-09-09Merge branch 'jt/interpret-branch-name-fallback'Libravatar Junio C Hamano1-1/+1
2020-09-02wt-status: tolerate dangling marksLibravatar Jonathan Tan1-1/+1
2020-08-21sequencer: treat CHERRY_PICK_HEAD as a pseudo refLibravatar Han-Wen Nienhuys1-1/+1
2020-08-03merge: make merge.renormalize work for all uses of merge machineryLibravatar Elijah Newren1-4/+0
2020-06-02Merge branch 'an/merge-single-strategy-optim'Libravatar Junio C Hamano1-1/+1
2020-05-19merge: optimization to skip evaluate_result for single strategyLibravatar Andrew Ng1-1/+1
2020-05-13Merge branch 'jc/auto-gc-quiet'Libravatar Junio C Hamano1-2/+1
2020-05-07auto-gc: pass --quiet down from am, commit, merge and rebaseLibravatar Junio C Hamano1-2/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 01:45:33 +0000