* [PATCH] merge-tree: fix argument type of the `--merge-base` option
@ 2024-04-12 12:10 Johannes Schindelin via GitGitGadget
2024-04-12 16:09 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Johannes Schindelin via GitGitGadget @ 2024-04-12 12:10 UTC (permalink / raw
To: git; +Cc: Johannes Schindelin, Johannes Schindelin
From: Johannes Schindelin <johannes.schindelin@gmx.de>
In 5f43cf5b2e4 (merge-tree: accept 3 trees as arguments, 2024-01-28), I
taught `git merge-tree` to perform three-way merges on trees. This
commit even changed the manual page to state that the `--merge-base`
option takes a tree-ish rather than requiring a commit.
But I forgot to adjust the in-program help text. This patch fixes that.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
merge-tree: adjust argument type of the --merge-base option
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1717%2Fdscho%2Fmerge-tree-document-merge-base-treeish-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1717/dscho/merge-tree-document-merge-base-treeish-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1717
builtin/merge-tree.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index 3492a575a6c..60eaf0ca9f1 100644
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -563,7 +563,7 @@ int cmd_merge_tree(int argc, const char **argv, const char *prefix)
PARSE_OPT_NONEG),
OPT_STRING(0, "merge-base",
&merge_base,
- N_("commit"),
+ N_("tree-ish"),
N_("specify a merge-base for the merge")),
OPT_STRVEC('X', "strategy-option", &xopts, N_("option=value"),
N_("option for selected merge strategy")),
base-commit: 342990c7aaef5ac645e89101cb84569caf64baf4
--
gitgitgadget
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] merge-tree: fix argument type of the `--merge-base` option
2024-04-12 12:10 [PATCH] merge-tree: fix argument type of the `--merge-base` option Johannes Schindelin via GitGitGadget
@ 2024-04-12 16:09 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2024-04-12 16:09 UTC (permalink / raw
To: Johannes Schindelin via GitGitGadget; +Cc: git, Johannes Schindelin
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> In 5f43cf5b2e4 (merge-tree: accept 3 trees as arguments, 2024-01-28), I
> taught `git merge-tree` to perform three-way merges on trees. This
> commit even changed the manual page to state that the `--merge-base`
> option takes a tree-ish rather than requiring a commit.
>
> But I forgot to adjust the in-program help text. This patch fixes that.
Thanks for being careful---better late than never ;-)
Will queue and fast-track, as I do not see much chance of regression
coming from here.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> merge-tree: adjust argument type of the --merge-base option
>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1717%2Fdscho%2Fmerge-tree-document-merge-base-treeish-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1717/dscho/merge-tree-document-merge-base-treeish-v1
> Pull-Request: https://github.com/gitgitgadget/git/pull/1717
>
> builtin/merge-tree.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
> index 3492a575a6c..60eaf0ca9f1 100644
> --- a/builtin/merge-tree.c
> +++ b/builtin/merge-tree.c
> @@ -563,7 +563,7 @@ int cmd_merge_tree(int argc, const char **argv, const char *prefix)
> PARSE_OPT_NONEG),
> OPT_STRING(0, "merge-base",
> &merge_base,
> - N_("commit"),
> + N_("tree-ish"),
> N_("specify a merge-base for the merge")),
> OPT_STRVEC('X', "strategy-option", &xopts, N_("option=value"),
> N_("option for selected merge strategy")),
>
> base-commit: 342990c7aaef5ac645e89101cb84569caf64baf4
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-04-12 16:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-12 12:10 [PATCH] merge-tree: fix argument type of the `--merge-base` option Johannes Schindelin via GitGitGadget
2024-04-12 16:09 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).