aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/merge.c (follow)
AgeCommit message (Expand)AuthorFilesLines
2021-06-10Merge branch 'ah/merge-usage-i18n-fix'Junio C Hamano1-2/+2
2021-05-16merge: don't translate literal commandsAlex Henrie1-2/+2
2021-05-03merge: fix swapped "up to date" message componentsJosh Soref1-5/+9
2021-05-03merge(s): apply consistent punctuation to "up to date" messagesEric Sunshine1-1/+1
2021-03-13use CALLOC_ARRAYRené Scharfe1-1/+1
2021-02-05Merge branch 'so/log-diff-merge'Junio C Hamano1-1/+2
2020-12-21diff-merges: new function diff_merges_suppress()Sergey Organov1-1/+2
2020-11-18Merge branch 'en/merge-ort-api-null-impl'Junio C Hamano1-3/+23
2020-11-02merge,rebase,revert: select ort or recursive by config or environmentElijah Newren1-3/+23
2020-10-20Documentation: stylistically normalize references to Signed-off-by:Bradley M. Kuhn1-1/+1
2020-09-25Merge branch 'ds/maintenance-part-1'Junio C Hamano1-1/+1
2020-09-17maintenance: replace run_auto_gc()Derrick Stolee1-1/+1
2020-09-09Merge branch 'jt/interpret-branch-name-fallback'Junio C Hamano1-1/+1
2020-09-02wt-status: tolerate dangling marksJonathan Tan1-1/+1
2020-08-21sequencer: treat CHERRY_PICK_HEAD as a pseudo refHan-Wen Nienhuys1-1/+1
2020-08-03merge: make merge.renormalize work for all uses of merge machineryElijah Newren1-4/+0
2020-06-02Merge branch 'an/merge-single-strategy-optim'Junio C Hamano1-1/+1
2020-05-19merge: optimization to skip evaluate_result for single strategyAndrew Ng1-1/+1
2020-05-13Merge branch 'jc/auto-gc-quiet'Junio C Hamano1-2/+1
2020-05-07auto-gc: pass --quiet down from am, commit, merge and rebaseJunio C Hamano1-2/+1
2020-05-05Merge branch 'dl/opt-callback-cleanup'Junio C Hamano1-2/+2
2020-05-01Merge branch 'ds/blame-on-bloom'Junio C Hamano1-2/+5
2020-04-29Merge branch 'dl/merge-autostash'Junio C Hamano1-0/+25
2020-04-28Use OPT_CALLBACK and OPT_CALLBACK_FDenton Liu1-2/+2
2020-04-16tests: write commit-graph with Bloom filtersDerrick Stolee1-2/+5
2020-04-11merge: use skip_prefix to parse config keyMartin Ågren1-3/+5
2020-04-10merge: teach --autostash optionDenton Liu1-0/+25
2020-01-15gpg-interface: add minTrustLevel as a configuration optionHans Jerry Illikainen1-2/+7
2019-10-07Merge branch 'tg/stash-refresh-index'Junio C Hamano1-10/+3
2019-09-20merge: use refresh_and_write_cacheThomas Gummerer1-10/+3
2019-08-07merge: --no-verify to bypass pre-merge-commit hookMichael J Gruber1-2/+2
2019-08-07git-merge: honor pre-merge-commit hookMichael J Gruber1-0/+12
2019-08-07merge: do no-verify like commitMichael J Gruber1-3/+3
2019-07-19Merge branch 'ea/merge-code-cleanup'Junio C Hamano1-33/+20
2019-07-09Merge branch 'ds/close-object-store'Junio C Hamano1-1/+1
2019-07-09builtin/merge.c - cleanup of code in for-cycle that tests strategiesEdmundo Carmona Antoranz1-33/+20
2019-06-17Merge branch 'vv/merge-squash-with-explicit-commit'Junio C Hamano1-1/+11
2019-06-13Merge branch 'nd/merge-quit'Junio C Hamano1-12/+18
2019-06-12packfile: rename close_all_packs to close_object_storeDerrick Stolee1-1/+1
2019-05-28merge: refuse --commit with --squashVishal Verma1-1/+11
2019-05-19merge: add --quitNguyễn Thái Ngọc Duy1-0/+13
2019-05-13merge: remove drop_save() in favor of remove_merge_branch_state()Nguyễn Thái Ngọc Duy1-12/+5
2019-04-19cherry-pick/revert: add scissors line on merge conflictDenton Liu1-8/+2
2019-04-18merge: add scissors line on merge conflictDenton Liu1-0/+14
2019-04-18merge: cleanup messages like commitDenton Liu1-10/+31
2019-03-07Merge branch 'nd/diff-parseopt'Junio C Hamano1-3/+6
2019-01-27parse-options: allow ll_callback with OPTION_CALLBACKNguyễn Thái Ngọc Duy1-0/+2
2019-01-27parse-options: avoid magic return codesNguyễn Thái Ngọc Duy1-2/+3
2019-01-27parse-options: stop abusing 'callback' for lowlevel callbacksNguyễn Thái Ngọc Duy1-1/+1
2019-01-24cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy1-0/+1
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-24 17:25:46 +0000