Kyle Zhao 66265a693e merge-tree.c: add --merge-base=<commit> option ...

This patch will give our callers more flexibility to use `git merge-tree`,
such as:

    git merge-tree --write-tree --merge-base=branch^ HEAD branch

This does a merge of HEAD and branch, but uses branch^ as the merge-base.

And the reason why using an option flag instead of a positional argument
is to allow additional commits passed to merge-tree to be handled via an
octopus merge in the future.

Signed-off-by: Kyle Zhao <kylezhao@tencent.com>
Signed-off-by: Taylor Blau <me@ttaylorr.com>

2022-11-12 23:53:04 -05:00

..

add.c

Merge branch 'ab/plug-leak-in-revisions'

2022-06-07 14:10:56 -07:00

am.c

git-compat-util.h: use "UNUSED", not "UNUSED(var)"

2022-09-01 10:49:48 -07:00

annotate.c

…

apply.c

apply.c: remove unnecessary include

2022-04-06 09:42:14 -07:00

archive.c

parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --options

2022-08-19 11:13:14 -07:00

bisect--helper.c

Merge branch 'rs/bisect-start-leakfix'

2022-10-17 14:56:32 -07:00

blame.c

parse-options: add support for parsing subcommands

2022-08-19 11:13:14 -07:00

branch.c

Merge branch 'rj/branch-edit-description-with-nth-checkout'

2022-10-21 11:37:29 -07:00

bugreport.c

builtin/bugreport.c: create '--diagnose' option

2022-08-12 13:20:02 -07:00

bundle.c

builtin/bundle.c: let parse-options parse subcommands

2022-08-19 11:13:15 -07:00

cat-file.c

Merge branch 'tb/cat-file-z'

2022-08-05 15:52:14 -07:00

check-attr.c

…

check-ignore.c

…

check-mailmap.c

…

check-ref-format.c

check-ref-format: fix trivial memory leak

2022-07-01 11:43:42 -07:00

checkout--worker.c

…

checkout-index.c

checkout-index: integrate with sparse index

2022-01-13 13:49:45 -08:00

checkout.c

git-compat-util.h: use "UNUSED", not "UNUSED(var)"

2022-09-01 10:49:48 -07:00

clean.c

Merge branch 'vd/sparse-clean-etc'

2022-02-17 16:25:05 -08:00

clone.c

Sync with v2.38.1

2022-10-17 15:46:09 -07:00

column.c

…

commit-graph.c

Merge branch 'ab/unused-annotation'

2022-09-14 12:56:39 -07:00

commit-tree.c

…

commit.c

commit: avoid writing to global in option callback

2022-10-06 09:58:06 -07:00

config.c

git-compat-util.h: use "UNUSED", not "UNUSED(var)"

2022-09-01 10:49:48 -07:00

count-objects.c

i18n: remove from i18n strings that do not hold translatable parts

2022-02-04 13:58:28 -08:00

credential-cache--daemon.c

…

credential-cache.c

…

credential-store.c

…

credential.c

…

describe.c

git-compat-util.h: use "UNUSED", not "UNUSED(var)"

2022-09-01 10:49:48 -07:00

diagnose.c

builtin/diagnose.c: don't translate the two mode values

2022-09-21 11:53:35 -07:00

diff-files.c

diff-files: move misplaced cleanup label

2022-07-12 07:17:28 -07:00

diff-index.c

revisions API: call diff_free(&revs->pruning) in revisions_release()

2022-04-13 23:56:10 -07:00

diff-tree.c

2.36 gitk/diff-tree --stdin regression fix

2022-04-26 09:26:35 -07:00

diff.c

Merge branch 'ab/plug-leak-in-revisions'

2022-06-07 14:10:56 -07:00

difftool.c

Merge branch 'ab/unused-annotation'

2022-09-14 12:56:39 -07:00

env--helper.c

parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --options

2022-08-19 11:13:14 -07:00

fast-export.c

Merge branch 'ab/unused-annotation'

2022-09-14 12:56:39 -07:00

fast-import.c

git-compat-util.h: use "UNUSED", not "UNUSED(var)"

2022-09-01 10:49:48 -07:00

fetch-pack.c

list-objects-filter: add and use initializers

2022-09-12 08:38:59 -07:00

fetch.c

Merge branch 'jk/list-objects-filter-cleanup'

2022-09-19 14:35:24 -07:00

fmt-merge-msg.c

merge: allow to pretend a merge is made into a different branch

2021-12-20 14:55:02 -08:00

for-each-ref.c

…

for-each-repo.c

…

fsck.c

Merge branch 'jk/fsck-on-diet'

2022-10-10 10:08:39 -07:00

fsmonitor--daemon.c

Merge branch 'ed/fsmonitor-on-networked-macos'

2022-10-17 14:56:31 -07:00

gc.c

Merge branch 'rs/gc-pack-refs-simplify'

2022-10-11 10:36:12 -07:00

get-tar-commit-id.c

…

grep.c

builtin/grep.c: integrate with sparse index

2022-09-23 09:41:27 -07:00

hash-object.c

Merge branch 'ab/object-file-api-updates'

2022-03-16 17:53:08 -07:00

help.c

git help: special-case scalar

2022-09-02 10:02:56 -07:00

hook.c

builtin/hook.c: let parse-options parse subcommands

2022-08-19 11:13:15 -07:00

index-pack.c

i18n: fix mismatched camelCase config variables

2022-06-17 10:38:26 -07:00

init-db.c

i18n: refactor "foo and bar are mutually exclusive"

2022-01-05 13:29:23 -08:00

interpret-trailers.c

…

log.c

Merge branch 'ab/unused-annotation'

2022-09-14 12:56:39 -07:00

ls-files.c

ls-files: fix black space in error message

2022-09-12 09:25:40 -07:00

ls-remote.c

Merge branch 'ep/maint-equals-null-cocci'

2022-05-20 15:26:59 -07:00

ls-tree.c

git-compat-util.h: use "UNUSED", not "UNUSED(var)"

2022-09-01 10:49:48 -07:00

mailinfo.c

…

mailsplit.c

Merge branch 'ep/maint-equals-null-cocci'

2022-05-20 15:26:59 -07:00

merge-base.c

merge-base: free() allocated "struct commit **" list

2022-03-04 13:24:17 -08:00

merge-file.c

merge-file: fix memory leaks on error path

2022-07-01 11:43:43 -07:00

merge-index.c

…

merge-ours.c

…

merge-recursive.c

gettext API users: don't explicitly cast ngettext()'s "n"

2022-03-07 11:57:52 -08:00

merge-tree.c

merge-tree.c: add --merge-base=<commit> option

2022-11-12 23:53:04 -05:00

merge.c

Merge branch 'en/merge-unstash-only-on-clean-merge' into maint

2022-09-13 12:21:11 -07:00

mktag.c

Merge branch 'ab/object-file-api-updates'

2022-03-16 17:53:08 -07:00

mktree.c

mktree: do not check type of remote objects

2022-06-21 10:12:15 -07:00

multi-pack-index.c

multi-pack-index: avoid writing to global in option callback

2022-10-06 09:56:51 -07:00

mv.c

Merge branch 'sy/mv-out-of-cone'

2022-09-19 14:35:23 -07:00

name-rev.c

git-compat-util.h: use "UNUSED", not "UNUSED(var)"

2022-09-01 10:49:48 -07:00

notes.c

notes, remote: show unknown subcommands between `'

2022-09-07 12:06:12 -07:00

pack-objects.c

Merge branch 'ab/unused-annotation'

2022-09-14 12:56:39 -07:00

pack-redundant.c

tree-wide: apply equals-null.cocci

2022-05-02 09:50:37 -07:00

pack-refs.c

…

patch-id.c

patch-id: fix scan_hunk_header on diffs with 1 line of before/after

2022-02-02 11:24:23 -08:00

prune-packed.c

i18n: remove from i18n strings that do not hold translatable parts

2022-02-04 13:58:28 -08:00

prune.c

revisions API users: add straightforward release_revisions()

2022-04-13 23:56:08 -07:00

pull.c

pull: fix a "struct oid_array" memory leak

2022-07-01 11:43:43 -07:00

push.c

push: improve grammar of branch.autoSetupMerge advice

2022-09-28 19:03:10 -07:00

range-diff.c

range-diff: optionally accept pathspecs

2022-08-26 09:49:26 -07:00

read-tree.c

read-tree: make three-way merge sparse-aware

2022-03-01 12:36:01 -08:00

rebase.c

rebase: add rebase.updateRefs config option

2022-07-19 12:49:04 -07:00

receive-pack.c

git-compat-util.h: use "UNUSED", not "UNUSED(var)"

2022-09-01 10:49:48 -07:00

reflog.c

refs: unify parse_worktree_ref() and ref_type()

2022-09-19 11:11:11 -07:00

remote-ext.c

…

remote-fd.c

…

remote.c

Merge branch 'jk/remote-rename-without-fetch-refspec'

2022-10-10 10:08:39 -07:00

repack.c

git-compat-util.h: use "UNUSED", not "UNUSED(var)"

2022-09-01 10:49:48 -07:00

replace.c

refs: use ref_namespaces for replace refs base

2022-08-05 14:13:12 -07:00

rerere.c

…

reset.c

pathspec.h: move pathspec_needs_expanded_index() from reset.c to here

2022-08-08 13:23:26 -07:00

rev-list.c

rev-list: support human-readable output for --disk-usage

2022-08-11 13:45:23 -07:00

rev-parse.c

Merge branch 'ab/unused-annotation'

2022-09-14 12:56:39 -07:00

revert.c

parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --options

2022-08-19 11:13:14 -07:00

rm.c

rm: integrate with sparse-index

2022-08-08 13:23:26 -07:00

send-pack.c

i18n: factorize "invalid value" messages

2022-02-04 13:58:28 -08:00

shortlog.c

parse-options: add support for parsing subcommands

2022-08-19 11:13:14 -07:00

show-branch.c

git-compat-util.h: use "UNUSED", not "UNUSED(var)"

2022-09-01 10:49:48 -07:00

show-index.c

…

show-ref.c

git-compat-util.h: use "UNUSED", not "UNUSED(var)"

2022-09-01 10:49:48 -07:00

sparse-checkout.c

pass subcommand "prefix" arguments to parse_options()

2022-08-25 09:43:29 -07:00

stash.c

Merge branch 'ab/unused-annotation'

2022-09-14 12:56:39 -07:00

stripspace.c

i18n: remove from i18n strings that do not hold translatable parts

2022-02-04 13:58:28 -08:00

submodule--helper.c

Merge branch 'jk/list-objects-filter-cleanup'

2022-09-19 14:35:24 -07:00

symbolic-ref.c

Merge branch 'jc/symbolic-ref-no-recurse'

2022-10-21 11:37:28 -07:00

tag.c

Merge branch 'ep/maint-equals-null-cocci'

2022-05-20 15:26:59 -07:00

unpack-file.c

…

unpack-objects.c

unpack-objects: use stream_loose_object() to unpack large objects

2022-06-13 10:22:36 -07:00

update-index.c

Merge branch 'jh/builtin-fsmonitor-part3'

2022-06-10 15:04:15 -07:00

update-ref.c

…

update-server-info.c

i18n: remove from i18n strings that do not hold translatable parts

2022-02-04 13:58:28 -08:00

upload-archive.c

…

upload-pack.c

…

var.c

…

verify-commit.c

…

verify-pack.c

…

verify-tag.c

…

worktree.c

builtin/worktree.c: let parse-options parse subcommands

2022-08-19 11:13:16 -07:00

write-tree.c

…