aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/merge.c
AgeCommit message (Expand)AuthorFilesLines
2025-09-18Merge branch 'pw/3.0-commentchar-auto-deprecation'Junio C Hamano1-0/+3
2025-08-26config: warn on core.commentString=autoPhillip Wood1-0/+3
2025-08-25Merge branch 'ps/commit-graph-wo-globals'Junio C Hamano1-1/+1
2025-08-22Merge branch 'ac/deglobal-fmt-merge-log-config'Junio C Hamano1-1/+2
2025-08-21Merge branch 'jc/string-list-split'Junio C Hamano1-1/+1
2025-08-15commit-graph: stop using `the_repository`Patrick Steinhardt1-1/+1
2025-08-11Merge branch 'rs/merge-compact-summary'Junio C Hamano1-1/+1
2025-08-11environment: remove the global variable 'merge_log_config'Ayush Chandekar1-1/+2
2025-08-09merge: don't document non-existing --compact-summary argumentRené Scharfe1-1/+1
2025-08-02string-list: align string_list_split() with its _in_place() counterpartJunio C Hamano1-1/+1
2025-07-23config: drop `git_config()` wrapperPatrick Steinhardt1-1/+1
2025-06-13merge/pull: extend merge.stat configuration variable to cover --compact-summaryJunio C Hamano1-2/+29
2025-06-13merge/pull: add the "--compact-summary" optionJunio C Hamano1-4/+35
2025-04-24Merge branch 'ps/parse-options-integers'Junio C Hamano1-8/+30
2025-04-17parse-options: introduce precision handling for `OPTION_INTEGER`Patrick Steinhardt1-0/+1
2025-04-17global: use designated initializers for optionsPatrick Steinhardt1-8/+29
2025-04-08builtin/{merge,rebase,revert}: remove GIT_TEST_MERGE_ALGORITHMElijah Newren1-13/+1
2025-04-08merge, sequencer: switch recursive merges over to ortElijah Newren1-7/+2
2025-01-17builtins: send usage_with_options() help text to standard outputJunio C Hamano1-2/+2
2024-12-23Merge branch 'ps/build-sign-compare'Junio C Hamano1-0/+3
2024-12-15Merge branch 'jc/forbid-head-as-tagname'Junio C Hamano1-1/+1
2024-12-06global: mark code units that generate warnings with `-Wsign-compare`Patrick Steinhardt1-0/+3
2024-12-03refs: drop strbuf_ prefix from helpersJunio C Hamano1-1/+1
2024-11-04builtin/merge: release output buffer after performing mergePatrick Steinhardt1-0/+1
2024-09-23Merge branch 'jc/pass-repo-to-builtins'Junio C Hamano1-4/+8
2024-09-13builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.hJohn Cai1-1/+2
2024-09-13builtin: add a repository parameter for builtin functionsJohn Cai1-3/+6
2024-09-12environment: make `get_index_file()` accept a repositoryPatrick Steinhardt1-6/+8
2024-09-12environment: make `get_git_dir()` accept a repositoryPatrick Steinhardt1-1/+3
2024-08-13hooks: remove implicit dependency on `the_repository`Patrick Steinhardt1-1/+1
2024-07-13merge-recursive: honor diff.algorithmAntonin Delpeuch1-1/+1
2024-07-08Merge branch 'ps/leakfixes-more'Junio C Hamano1-4/+14
2024-07-02Merge branch 'ps/use-the-repository'Junio C Hamano1-3/+4
2024-06-18merge: avoid write merge state when unable to write indexKyle Zhao1-1/+1
2024-06-14hash: require hash algorithm in `empty_tree_oid_hex()`Patrick Steinhardt1-1/+2
2024-06-14hash: require hash algorithm in `oidread()` and `oidclr()`Patrick Steinhardt1-2/+2
2024-06-11merge: fix leaking merge basesPatrick Steinhardt1-0/+2
2024-06-11builtin/merge: fix leaking `struct cmdnames` in `get_strategy()`Patrick Steinhardt1-3/+7
2024-06-11commit: fix leaking parents when calling `commit_tree_extended()`Patrick Steinhardt1-1/+5
2024-06-07builtin/merge: always store allocated strings in `pull_twohead`Patrick Steinhardt1-7/+11
2024-05-27config: clarify memory ownership in `git_config_string()`Patrick Steinhardt1-2/+2
2024-05-16Merge branch 'ps/refs-without-the-repository'Junio C Hamano1-12/+22
2024-05-07cocci: apply rules to rewrite callers of "refs" interfacesPatrick Steinhardt1-12/+22
2024-04-18builtin: stop using `the_index`Patrick Steinhardt1-16/+15
2024-04-05Merge branch 'jk/core-comment-string'Junio C Hamano1-6/+6
2024-03-28Merge branch 'eb/hash-transition'Junio C Hamano1-1/+2
2024-03-12prefer comment_line_str to comment_line_char for printingJeff King1-2/+2
2024-03-12strbuf: accept a comment string for strbuf_commented_addf()Jeff King1-4/+4
2024-03-11Merge branch 'js/merge-base-with-missing-commit'Junio C Hamano1-9/+17
2024-02-29commit-reach(get_octopus_merge_bases): pass on "missing commits" errorsJohannes Schindelin1-1/+5
2024-02-29commit-reach(repo_get_merge_bases): pass on "missing commits" errorsJohannes Schindelin1-8/+12
2024-02-26Merge branch 'rs/use-xstrncmpz'Junio C Hamano1-2/+1
2024-02-12use xstrncmpz()René Scharfe1-2/+1
2024-02-08Merge branch 'en/header-cleanup' into maint-2.43Junio C Hamano1-4/+0
2024-02-08Merge branch 'la/trailer-cleanups' into maint-2.43Junio C Hamano1-1/+1
2024-01-19refs: convert MERGE_AUTOSTASH to become a normal pseudo-refPatrick Steinhardt1-14/+13
2024-01-08Merge branch 'en/header-cleanup'Junio C Hamano1-4/+0
2024-01-02Merge branch 'la/trailer-cleanups'Junio C Hamano1-1/+1
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren1-4/+0
2023-10-20commit: ignore_non_trailer computes number of bytes to ignoreLinus Arver1-1/+1
2023-10-13Merge branch 'jk/commit-graph-leak-fixes'Junio C Hamano1-1/+4
2023-10-03merge: free result of repo_get_merge_bases()Jeff King1-1/+4
2023-10-02tree-walk: init_tree_desc take an oid to get the hash algorithmEric W. Biederman1-1/+2
2023-09-29diff --stat: set the width defaults in a helper functionDragan Simic1-3/+1
2023-09-18diff --stat: add config option to limit filename widthDragan Simic1-0/+1
2023-09-05merge: do not pass unused opt->value parameterJeff King1-1/+1
2023-09-05parse-options: mark unused "opt" parameter in callbacksJeff King1-1/+1
2023-08-31merge: simplify parsing of "-n" optionJeff King1-11/+2
2023-08-31merge: make xopts a strvecJeff King1-19/+7
2023-07-17Merge branch 'cw/compat-util-header-cleanup'Junio C Hamano1-2/+0
2023-07-06Merge branch 'gc/config-context'Junio C Hamano1-3/+4
2023-07-06Merge branch 'cw/strbuf-cleanup'Junio C Hamano1-4/+6
2023-07-05git-compat-util: move alloc macros to git-compat-util.hCalvin Wan1-1/+0
2023-07-05treewide: remove unnecessary includes for wrapper.hCalvin Wan1-1/+0
2023-06-28config: add ctx arg to config_fn_tGlen Choo1-3/+4
2023-06-21repository: remove unnecessary include of path.hElijah Newren1-0/+1
2023-06-21cache.h: remove this no-longer-used headerElijah Newren1-2/+1
2023-06-21merge.h: move declarations for merge.c from cache.hElijah Newren1-0/+1
2023-06-12strbuf: remove global variableCalvin Wan1-4/+6
2023-04-11editor: move editor-related functions and declarations into common fileElijah Newren1-0/+1
2023-04-11object-name.h: move declarations for object-name.c functions from cache.hElijah Newren1-0/+1
2023-04-11treewide: be explicit about dependence on advice.hElijah Newren1-0/+1
2023-04-04Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano1-9/+14
2023-03-28cocci: apply the "refs.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-1/+2
2023-03-28cocci: apply the "commit.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-1/+2
2023-03-28cocci: apply the "commit-reach.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-2/+5
2023-03-28cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-5/+5
2023-03-21wrapper.h: move declarations for wrapper.c functions from cache.hElijah Newren1-0/+1
2023-03-21abspath.h: move absolute path functions from cache.hElijah Newren1-0/+1
2023-03-21environment: move comment_line_char from cache.hElijah Newren1-0/+1
2023-03-21treewide: be explicit about dependence on gettext.hElijah Newren1-0/+1
2023-03-17Merge branch 'jc/gpg-lazy-init'Junio C Hamano1-3/+0
2023-02-23cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren1-0/+1
2023-02-23alloc.h: move ALLOC_GROW() functions from cache.hElijah Newren1-0/+1
2023-02-22Merge branch 'ab/various-leak-fixes'Junio C Hamano1-8/+6
2023-02-10cocci & cache.h: remove "USE_THE_INDEX_COMPATIBILITY_MACROS"Ævar Arnfjörð Bjarmason1-3/+3
2023-02-10cocci & cache-tree.h: migrate "write_cache_as_tree" to "*_index_*"Ævar Arnfjörð Bjarmason1-1/+1
2023-02-09gpg-interface: lazily initialize and read the configurationJunio C Hamano1-3/+0
2023-02-06builtin/merge.c: free "&buf" on "Your local changes..." errorÆvar Arnfjörð Bjarmason1-1/+2
2023-02-06builtin/merge.c: use fixed strings, not "strbuf", fix leakÆvar Arnfjörð Bjarmason1-7/+4
2023-01-13merge: break out of all_strategy loop when strategy is foundSeija Kijin1-1/+1
2022-12-26Merge branch 'jk/unused-post-2.39'Junio C Hamano1-1/+1
2022-12-14Merge branch 'ab/various-leak-fixes'Junio C Hamano1-0/+1
2022-12-13diff: mark unused parameters in callbacksJeff King1-1/+1
2022-11-21{reset,merge}: call discard_index() before returningÆvar Arnfjörð Bjarmason1-0/+1
2022-11-21cocci: apply "pending" index-compatibility to some "builtin/*.c"Ævar Arnfjörð Bjarmason1-7/+12
2022-11-21cocci & cache.h: apply variable section of "pending" index-compatibilityÆvar Arnfjörð Bjarmason1-3/+3
2022-11-21cocci & cache.h: apply a selection of "pending" index-compatibilityÆvar Arnfjörð Bjarmason1-1/+1
2022-11-21read-cache API & users: make discard_index() return voidÆvar Arnfjörð Bjarmason1-1/+2
2022-11-21cocci & cache.h: remove rarely used "the_index" compat macrosÆvar Arnfjörð Bjarmason1-1/+1
2022-10-30use child_process members "args" and "env" directlyRené Scharfe1-5/+5
2022-10-30use child_process member "args" instead of string array variableRené Scharfe1-20/+12
2022-10-30merge: remove always-the-same "verbose" argumentsÆvar Arnfjörð Bjarmason1-8/+5
2022-09-01Merge branch 'en/merge-multi-strategies'Junio C Hamano1-9/+11
2022-09-01Merge branch 'en/merge-unstash-only-on-clean-merge'Junio C Hamano1-1/+4
2022-08-24merge: small code readability improvementElijah Newren1-3/+3
2022-08-24merge: cleanup confusing logic for handling successful mergesElijah Newren1-7/+9
2022-08-24merge: only apply autostash when appropriateElijah Newren1-1/+4
2022-07-22merge: do not exit restore_state() prematurelyElijah Newren1-4/+6
2022-07-22merge: ensure we can actually restore pre-merge stateElijah Newren1-5/+5
2022-07-22merge: make restore_state() restore staged state tooElijah Newren1-3/+5
2022-07-22merge: fix save_state() to work when there are stat-dirty filesElijah Newren1-0/+8
2022-07-22merge: do not abort early if one strategy fails to handle the mergeElijah Newren1-2/+4
2022-07-22merge: abort if index does not match HEAD for trivial mergesElijah Newren1-0/+15
2022-07-06cocci: add and apply a rule to find "unused" strbufsÆvar Arnfjörð Bjarmason1-4/+0
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