summaryrefslogtreecommitdiff
path: root/builtin/merge.c
AgeCommit message (Expand)AuthorFilesLines
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
2020-05-05Merge branch 'dl/opt-callback-cleanup'Libravatar Junio C Hamano1-2/+2
2020-05-01Merge branch 'ds/blame-on-bloom'Libravatar Junio C Hamano1-2/+5
2020-04-29Merge branch 'dl/merge-autostash'Libravatar Junio C Hamano1-0/+25
2020-04-28Use OPT_CALLBACK and OPT_CALLBACK_FLibravatar Denton Liu1-2/+2
2020-04-16tests: write commit-graph with Bloom filtersLibravatar Derrick Stolee1-2/+5
2020-04-11merge: use skip_prefix to parse config keyLibravatar Martin Ågren1-3/+5
2020-04-10merge: teach --autostash optionLibravatar Denton Liu1-0/+25
2020-01-15gpg-interface: add minTrustLevel as a configuration optionLibravatar Hans Jerry Illikainen1-2/+7
2019-10-07Merge branch 'tg/stash-refresh-index'Libravatar Junio C Hamano1-10/+3
2019-09-20merge: use refresh_and_write_cacheLibravatar Thomas Gummerer1-10/+3
2019-08-07merge: --no-verify to bypass pre-merge-commit hookLibravatar Michael J Gruber1-2/+2
2019-08-07git-merge: honor pre-merge-commit hookLibravatar Michael J Gruber1-0/+12
2019-08-07merge: do no-verify like commitLibravatar Michael J Gruber1-3/+3
2019-07-19Merge branch 'ea/merge-code-cleanup'Libravatar Junio C Hamano1-33/+20
2019-07-09Merge branch 'ds/close-object-store'Libravatar Junio C Hamano1-1/+1
2019-07-09builtin/merge.c - cleanup of code in for-cycle that tests strategiesLibravatar Edmundo Carmona Antoranz1-33/+20
2019-06-17Merge branch 'vv/merge-squash-with-explicit-commit'Libravatar Junio C Hamano1-1/+11
2019-06-13Merge branch 'nd/merge-quit'Libravatar Junio C Hamano1-12/+18
2019-06-12packfile: rename close_all_packs to close_object_storeLibravatar Derrick Stolee1-1/+1
2019-05-28merge: refuse --commit with --squashLibravatar Vishal Verma1-1/+11
2019-05-19merge: add --quitLibravatar Nguyễn Thái Ngọc Duy1-0/+13
2019-05-13merge: remove drop_save() in favor of remove_merge_branch_state()Libravatar Nguyễn Thái Ngọc Duy1-12/+5
2019-04-19cherry-pick/revert: add scissors line on merge conflictLibravatar Denton Liu1-8/+2
2019-04-18merge: add scissors line on merge conflictLibravatar Denton Liu1-0/+14
2019-04-18merge: cleanup messages like commitLibravatar Denton Liu1-10/+31
2019-03-07Merge branch 'nd/diff-parseopt'Libravatar Junio C Hamano1-3/+6
2019-01-27parse-options: allow ll_callback with OPTION_CALLBACKLibravatar Nguyễn Thái Ngọc Duy1-0/+2
2019-01-27parse-options: avoid magic return codesLibravatar Nguyễn Thái Ngọc Duy1-2/+3
2019-01-27parse-options: stop abusing 'callback' for lowlevel callbacksLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2019-01-24cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchLibravatar Nguyễn Thái Ngọc Duy1-0/+1
2019-01-14merge-recursive.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2019-01-04Merge branch 'nd/the-index'Libravatar Junio C Hamano1-1/+1
2019-01-04Merge branch 'nd/i18n'Libravatar Junio C Hamano1-2/+2
2018-11-18Merge branch 'jk/verify-sig-merge-into-void'Libravatar Junio C Hamano1-25/+5
2018-11-12sequencer.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2018-11-12parse-options: replace opterror() with optname()Libravatar Nguyễn Thái Ngọc Duy1-1/+1
2018-11-12alias.c: mark split_cmdline_strerror() strings for translationLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2018-11-07merge: handle --verify-signatures for unborn branchLibravatar Jeff King1-0/+4
2018-11-07merge: extract verify_merge_signature() helperLibravatar Jeff King1-25/+1
2018-11-06assert NOARG/NONEG behavior of parse-options callbacksLibravatar Jeff King1-0/+1