aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/merge.c
AgeCommit message (Expand)AuthorFilesLines
2022-04-13revisions API users: add straightforward release_revisions()Ævar Arnfjörð Bjarmason1-0/+2
2022-03-07hooks: fix an obscure TOCTOU "did we just run a hook?" raceÆvar Arnfjörð Bjarmason1-4/+7
2022-03-07merge: don't run post-hook logic on --no-verifyÆvar Arnfjörð Bjarmason1-9/+12
2022-02-18Merge branch 'pw/use-in-process-checkout-in-rebase'Junio C Hamano1-4/+2
2022-02-09Merge branch 'en/plug-leaks-in-merge'Junio C Hamano1-1/+5
2022-02-09Merge branch 'ab/config-based-hooks-2'Junio C Hamano1-1/+1
2022-01-26create_autostash(): remove unneeded parameterPhillip Wood1-4/+2
2022-01-21merge: fix memory leaks in cmd_merge()Elijah Newren1-1/+5
2022-01-10Merge branch 'ja/i18n-similar-messages'Junio C Hamano1-2/+2
2022-01-07merge: convert post-merge to use hook.hEmily Shaffer1-1/+1
2022-01-05Merge branch 'jc/merge-detached-head-name'Junio C Hamano1-0/+4
2022-01-05i18n: turn "options are incompatible" into "cannot be used together"Jean-Noël Avila1-2/+2
2021-12-20merge: allow to pretend a merge is made into a different branchJunio C Hamano1-0/+4
2021-11-25run-command API users: use strvec_pushl(), not argv constructionÆvar Arnfjörð Bjarmason1-2/+1
2021-10-25Merge branch 'ab/mark-leak-free-tests-more'Junio C Hamano1-0/+2
2021-10-13Merge branch 'ab/config-based-hooks-1'Junio C Hamano1-1/+2
2021-10-13Merge branch 'en/removing-untracked-fixes'Junio C Hamano1-0/+1
2021-10-07merge: add missing strbuf_release()Ævar Arnfjörð Bjarmason1-0/+2
2021-09-27Remove ignored files by default when they are in the wayElijah Newren1-2/+1
2021-09-27unpack-trees: introduce preserve_ignored to unpack_trees_optionsElijah Newren1-0/+2
2021-09-27hook.c users: use "hook_exists()" instead of "find_hook()"Ævar Arnfjörð Bjarmason1-1/+1
2021-09-27hook.[ch]: move find_hook() from run-command.c to hook.cÆvar Arnfjörð Bjarmason1-0/+1
2021-09-20Merge branch 'js/run-command-close-packs'Junio C Hamano1-1/+0
2021-09-20Merge branch 'ds/mergies-with-sparse-index'Junio C Hamano1-0/+3
2021-09-10Merge branch 'ab/retire-advice-config'Junio C Hamano1-2/+2
2021-09-09merge: make sparse-aware with ORTDerrick Stolee1-0/+3
2021-09-09run_auto_maintenance(): implicitly close the object storeJohannes Schindelin1-1/+0
2021-09-08Merge branch 'rs/xopen-reports-open-failures'Junio C Hamano1-3/+1
2021-08-30Merge branch 'cb/builtin-merge-format-string-fix'Junio C Hamano1-3/+5
2021-08-30Merge branch 'en/ort-becomes-the-default'Junio C Hamano1-2/+8
2021-08-30Merge branch 'en/merge-strategy-docs'Junio C Hamano1-1/+1
2021-08-30Merge branch 'en/pull-conflicting-options'Junio C Hamano1-1/+1
2021-08-25use xopen() to handle fatal open(2) failuresRené Scharfe1-3/+1
2021-08-25advice: remove read uses of most global `advice_` variablesBen Boeckel1-2/+2
2021-08-09builtin/merge: avoid -Wformat-extra-args from ancient XcodeCarlo Marcelo Arenas Belón1-3/+5
2021-08-05Change default merge backend from recursive to ortElijah Newren1-2/+8
2021-08-05Update error message and code commentElijah Newren1-1/+1
2021-08-04Merge branch 'pb/merge-autostash-more'Junio C Hamano1-1/+3
2021-07-26builtin/merge: free found_ref when doneAndrzej Hunt1-1/+2
2021-07-23merge: apply autostash if merge strategy failsPhilippe Blain1-0/+1
2021-07-23merge: apply autostash if fast-forward failsPhilippe Blain1-0/+1
2021-07-23merge: add missing word "strategy" to a messagePhilippe Blain1-1/+1
2021-07-20pull: abort if --ff-only is given and fast-forwarding is impossibleAlex Henrie1-1/+1
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
2019-01-14merge-recursive.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+1
2019-01-04Merge branch 'nd/the-index'Junio C Hamano1-1/+1
2019-01-04Merge branch 'nd/i18n'Junio C Hamano1-2/+2
2018-11-18Merge branch 'jk/verify-sig-merge-into-void'Junio C Hamano1-25/+5
2018-11-12sequencer.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+1
2018-11-12parse-options: replace opterror() with optname()Nguyễn Thái Ngọc Duy1-1/+1
2018-11-12alias.c: mark split_cmdline_strerror() strings for translationNguyễn Thái Ngọc Duy1-1/+1
2018-11-07merge: handle --verify-signatures for unborn branchJeff King1-0/+4
2018-11-07merge: extract verify_merge_signature() helperJeff King1-25/+1
2018-11-06assert NOARG/NONEG behavior of parse-options callbacksJeff King1-0/+1
2018-10-19Merge branch 'nd/the-index'Junio C Hamano1-7/+9
2018-09-21revision.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-2/+2
2018-09-21rerere.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+1
2018-09-21merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-3/+5
2018-09-21diff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+1
2018-09-17Merge branch 'jk/cocci'Junio C Hamano1-3/+3
2018-09-17Merge branch 'ds/reachable'Junio C Hamano1-0/+1
2018-08-29convert "oidcmp() != 0" to "!oideq()"Jeff King1-1/+1
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King1-2/+2
2018-08-15Merge branch 'nd/i18n'Junio C Hamano1-1/+1
2018-08-02Merge branch 'js/rebase-merge-octopus'Junio C Hamano1-0/+32
2018-08-02Merge branch 'bc/object-id'Junio C Hamano1-5/+6
2018-07-23Update messages in preparation for i18nNguyễn Thái Ngọc Duy1-1/+1
2018-07-20commit.h: remove method declarationsDerrick Stolee1-0/+1
2018-07-18Merge branch 'sb/object-store-grafts'Junio C Hamano1-18/+19
2018-07-16builtin/merge: switch to use the_hash_algobrian m. carlson1-5/+6
2018-07-11merge: allow reading the merge commit message from a fileJohannes Schindelin1-0/+32
2018-06-29Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano1-18/+19
2018-06-25Merge branch 'ds/commit-graph-lockfile-fix'Junio C Hamano1-3/+4
2018-06-25Merge branch 'nd/commit-util-to-slab'Junio C Hamano1-12/+13
2018-06-01Merge branch 'nd/use-opt-int-set-f'Junio C Hamano1-3/+3
2018-06-01Merge branch 'nd/command-list'Junio C Hamano1-0/+1
2018-05-30Merge branch 'bw/ref-prefix-for-configured-refspec'Junio C Hamano1-0/+1
2018-05-30Merge branch 'bc/object-id'Junio C Hamano1-7/+7
2018-05-30Merge branch 'ma/lockfile-cleanup'Junio C Hamano1-2/+2
2018-05-24Use OPT_SET_INT_F() for cmdline option specificationNguyễn Thái Ngọc Duy1-3/+3
2018-05-22merge: check config before loading commitsDerrick Stolee1-3/+4
2018-05-21merge: use commit-slab in merge remote desc instead of commit->utilNguyễn Thái Ngọc Duy1-12/+13
2018-05-21Move declaration for alias.c to alias.hNguyễn Thái Ngọc Duy1-0/+1
2018-05-18path.c: migrate global git_path_* to take a repository argumentStefan Beller1-18/+19
2018-05-18refspec: move refspec parsing logic into its own fileBrandon Williams1-0/+1
2018-05-10lock_file: make function-local locks non-staticMartin Ågren1-2/+2
2018-05-02builtin/merge: switch tree functions to use object_idbrian m. carlson1-7/+7
2018-04-11Merge branch 'sb/object-store'Junio C Hamano1-1/+1
2018-04-11Merge branch 'bw/c-plus-plus' into ds/lazy-load-treesJunio C Hamano1-1/+1
2018-04-10Merge branch 'bc/object-id'Junio C Hamano1-4/+4
2018-03-26object-store: close all packs upon clearing the object storeStefan Beller1-1/+1
2018-03-21Merge branch 'ma/skip-writing-unchanged-index'Junio C Hamano1-9/+6
2018-03-14Convert find_unique_abbrev* to struct object_idbrian m. carlson1-3/+3
2018-03-14cache-tree: convert write_*_as_tree to object_idbrian m. carlson1-1/+1
2018-03-06Merge branch 'bw/c-plus-plus'Junio C Hamano1-1/+1
2018-03-06Merge branch 'jc/allow-ff-merging-kept-tags'Junio C Hamano1-4/+39
2018-03-01write_locked_index(): add flag to avoid writing unchanged indexMartin Ågren1-9/+6
2018-02-16merge: allow fast-forward when merging a tracked tagJunio C Hamano1-4/+39
2018-02-14object: rename function 'typename' to 'type_name'Brandon Williams1-1/+1
2018-01-30commit: convert commit_tree* to object_idPatryk Obara1-4/+4
2017-12-12merge: add config option for verifySignaturesHans Jerry Illikainen1-0/+2
2017-11-15Merge branch 'ma/reduce-heads-leakfix'Junio C Hamano1-0/+1
2017-11-08reduce_heads: fix memory leaksMartin Ågren1-0/+1
2017-10-16refs: convert dwim_ref and expand_ref to struct object_idbrian m. carlson1-1/+1
2017-10-16refs: convert resolve_refdup and refs_resolve_refdup to struct object_idbrian m. carlson1-1/+1
2017-10-16refs: convert update_ref and refs_update_ref to use struct object_idbrian m. carlson1-7/+6
2017-09-19Merge branch 'rs/strbuf-leakfix'Junio C Hamano1-2/+7
2017-09-19Merge branch 'sb/merge-commit-msg-hook'Junio C Hamano1-0/+8
2017-09-10Merge branch 'ma/up-to-date'Junio C Hamano1-2/+2
2017-09-08builtin/merge: honor commit-msg hook for mergesStefan Beller1-0/+8
2017-09-07merge: release strbuf after use in write_merge_heads()Rene Scharfe1-0/+1
2017-09-07merge: release strbuf after use in save_state()Rene Scharfe1-2/+6
2017-08-26Merge branch 'mg/killed-merge'Junio C Hamano1-3/+12
2017-08-26Merge branch 'jt/packmigrate'Junio C Hamano1-0/+1
2017-08-24Merge branch 'lg/merge-signoff'Junio C Hamano1-0/+4
2017-08-23pack: move pack-closing functionsJonathan Tan1-0/+1
2017-08-23treewide: correct several "up-to-date" to "up to date"Martin Ågren1-2/+2
2017-08-23merge: save merge state earlierMichael J Gruber1-0/+2
2017-08-23merge: split write_merge_state in twoMichael J Gruber1-3/+8
2017-08-23merge: clarify call chainMichael J Gruber1-0/+2
2017-08-22Merge branch 'rs/merge-microcleanup'Junio C Hamano1-2/+2
2017-08-22Merge branch 'ma/parse-maybe-bool'Junio C Hamano1-2/+2
2017-08-10merge: use skip_prefix()René Scharfe1-2/+2
2017-08-07treewide: deprecate git_config_maybe_bool, use git_parse_maybe_boolMartin Ågren1-2/+2
2017-07-25merge: add a --signoff flagŁukasz Gryglicki1-0/+4
2017-07-17use MOVE_ARRAYRené Scharfe1-1/+1
2017-06-24Merge branch 'bw/config-h'Junio C Hamano1-0/+1
2017-06-19Merge branch 'bw/object-id'Junio C Hamano1-1/+1
2017-06-15config: don't include config.h by defaultBrandon Williams1-0/+1
2017-06-13Merge branch 'nd/fopen-errors'Junio C Hamano1-3/+1
2017-06-05diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams1-1/+1
2017-05-26use xfopen() in more placesNguyễn Thái Ngọc Duy1-3/+1
2017-05-08tree: convert parse_tree_indirect to struct object_idbrian m. carlson1-3/+3
2017-05-08merge: convert checkout_fast_forward to struct object_idbrian m. carlson1-2/+2
2017-05-08Convert lookup_commit* to struct object_idbrian m. carlson1-1/+1
2017-04-19Merge branch 'bc/object-id'Junio C Hamano1-1/+1
2017-03-30Merge branch 'jc/merge-drop-old-syntax'Junio C Hamano1-50/+9
2017-03-26Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZbrian m. carlson1-1/+1
2017-03-17Merge branch 'bc/object-id'Junio C Hamano1-68/+66
2017-03-14Merge branch 'jk/interpret-branch-name'Junio C Hamano1-1/+1
2017-03-02interpret_branch_name: allow callers to restrict expansionsJeff King1-1/+1
2017-02-22builtin/merge: convert to struct object_idbrian m. carlson1-68/+66
2016-12-27Merge branch 'cp/merge-continue'Junio C Hamano1-0/+25
2016-12-15merge: mark usage error strings for translationJeff King1-2/+2
2016-12-14merge: ensure '--abort' option takes no argumentsChris Packham1-0/+4
2016-12-14merge: add '--continue' option as a synonym for 'git commit'Chris Packham1-0/+21
2016-12-07hold_locked_index(): align error handling with hold_lockfile_for_update()Junio C Hamano1-3/+3
2016-10-26find_unique_abbrev: use 4-buffer ringJeff King1-6/+5
2016-09-15use strbuf_addstr() for adding constant strings to a strbuf, part 2René Scharfe1-1/+1
2016-08-12Merge branch 'rs/merge-add-strategies-simplification'Junio C Hamano1-34/+10
2016-08-05merge: use string_list_split() in add_strategies()René Scharfe1-34/+10
generated by cgit 1.2.3-korg (git 2.43.0) at 2025-12-07 14:48:49 +0000