summaryrefslogtreecommitdiff
path: root/builtin/merge.c
AgeCommit message (Expand)Author
13 daysmerge: fix swapped "up to date" message componentsJosh Soref
13 daysmerge(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
2020-06-02Merge branch 'an/merge-single-strategy-optim'Junio C Hamano
2020-05-19merge: optimization to skip evaluate_result for single strategyAndrew Ng
2020-05-13Merge branch 'jc/auto-gc-quiet'Junio C Hamano
2020-05-07auto-gc: pass --quiet down from am, commit, merge and rebaseJunio C Hamano
2020-05-05Merge branch 'dl/opt-callback-cleanup'Junio C Hamano
2020-05-01Merge branch 'ds/blame-on-bloom'Junio C Hamano
2020-04-29Merge branch 'dl/merge-autostash'Junio C Hamano
2020-04-28Use OPT_CALLBACK and OPT_CALLBACK_FDenton Liu
2020-04-16tests: write commit-graph with Bloom filtersDerrick Stolee
2020-04-11merge: use skip_prefix to parse config keyMartin Ågren
2020-04-10merge: teach --autostash optionDenton Liu
2020-01-15gpg-interface: add minTrustLevel as a configuration optionHans Jerry Illikainen
2019-10-07Merge branch 'tg/stash-refresh-index'Junio C Hamano
2019-09-20merge: use refresh_and_write_cacheThomas Gummerer
2019-08-07merge: --no-verify to bypass pre-merge-commit hookMichael J Gruber
2019-08-07git-merge: honor pre-merge-commit hookMichael J Gruber
2019-08-07merge: do no-verify like commitMichael J Gruber
2019-07-19Merge branch 'ea/merge-code-cleanup'Junio C Hamano
2019-07-09Merge branch 'ds/close-object-store'Junio C Hamano
2019-07-09builtin/merge.c - cleanup of code in for-cycle that tests strategiesEdmundo Carmona Antoranz
2019-06-17Merge branch 'vv/merge-squash-with-explicit-commit'Junio C Hamano
2019-06-13Merge branch 'nd/merge-quit'Junio C Hamano
2019-06-12packfile: rename close_all_packs to close_object_storeDerrick Stolee
2019-05-28merge: refuse --commit with --squashVishal Verma
2019-05-19merge: add --quitNguyễn Thái Ngọc Duy
2019-05-13merge: remove drop_save() in favor of remove_merge_branch_state()Nguyễn Thái Ngọc Duy
2019-04-19cherry-pick/revert: add scissors line on merge conflictDenton Liu
2019-04-18merge: add scissors line on merge conflictDenton Liu
2019-04-18merge: cleanup messages like commitDenton Liu
2019-03-07Merge branch 'nd/diff-parseopt'Junio C Hamano
2019-01-28parse-options: allow ll_callback with OPTION_CALLBACKNguyễn Thái Ngọc Duy
2019-01-28parse-options: avoid magic return codesNguyễn Thái Ngọc Duy
2019-01-28parse-options: stop abusing 'callback' for lowlevel callbacksNguyễn Thái Ngọc Duy
2019-01-24cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy
2019-01-14merge-recursive.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2019-01-04Merge branch 'nd/the-index'Junio C Hamano