* [PATCH] rebase: hide --preserve-merges option
@ 2019-10-18 23:55 Denton Liu
2019-10-21 3:04 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Denton Liu @ 2019-10-18 23:55 UTC (permalink / raw)
To: Git Mailing List; +Cc: Johannes Schindelin
Since --preserve-merges has been deprecated in favour of
--rebase-merges, mark this option as hidden so it no longer shows up in
the usage and completions.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
---
This patch continues the deprecation effort and can be based on top of
`js/rebase-deprecate-preserve-merges`.
builtin/rebase.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 21ac10f739..0d63651d95 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1099,9 +1099,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
N_("let the user edit the list of commits to rebase"),
PARSE_OPT_NOARG | PARSE_OPT_NONEG,
parse_opt_interactive },
- OPT_SET_INT('p', "preserve-merges", &options.type,
- N_("(DEPRECATED) try to recreate merges instead of "
- "ignoring them"), REBASE_PRESERVE_MERGES),
+ OPT_SET_INT_F('p', "preserve-merges", &options.type,
+ N_("(DEPRECATED) try to recreate merges instead of "
+ "ignoring them"),
+ REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN),
OPT_BOOL(0, "rerere-autoupdate",
&options.allow_rerere_autoupdate,
N_("allow rerere to update index with resolved "
--
2.23.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] rebase: hide --preserve-merges option
2019-10-18 23:55 [PATCH] rebase: hide --preserve-merges option Denton Liu
@ 2019-10-21 3:04 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2019-10-21 3:04 UTC (permalink / raw)
To: Denton Liu; +Cc: Git Mailing List, Johannes Schindelin
Denton Liu <liu.denton@gmail.com> writes:
> Since --preserve-merges has been deprecated in favour of
> --rebase-merges, mark this option as hidden so it no longer shows up in
> the usage and completions.
>
> Signed-off-by: Denton Liu <liu.denton@gmail.com>
> ---
> This patch continues the deprecation effort and can be based on top of
> `js/rebase-deprecate-preserve-merges`.
Sounds good. Let's keep it and have it part of the first batch
after the release.
>
> builtin/rebase.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index 21ac10f739..0d63651d95 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -1099,9 +1099,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
> N_("let the user edit the list of commits to rebase"),
> PARSE_OPT_NOARG | PARSE_OPT_NONEG,
> parse_opt_interactive },
> - OPT_SET_INT('p', "preserve-merges", &options.type,
> - N_("(DEPRECATED) try to recreate merges instead of "
> - "ignoring them"), REBASE_PRESERVE_MERGES),
> + OPT_SET_INT_F('p', "preserve-merges", &options.type,
> + N_("(DEPRECATED) try to recreate merges instead of "
> + "ignoring them"),
> + REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN),
> OPT_BOOL(0, "rerere-autoupdate",
> &options.allow_rerere_autoupdate,
> N_("allow rerere to update index with resolved "
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-10-21 3:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-18 23:55 [PATCH] rebase: hide --preserve-merges option Denton Liu
2019-10-21 3:04 ` Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).