git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Philip Oakley via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Philip Oakley <philipoakley@iee.email>,
	Philip Oakley <philipoakley@iee.email>
Subject: [PATCH 1/3] rebase.c: state preserve-merges has been removed
Date: Thu, 26 May 2022 09:21:03 +0000	[thread overview]
Message-ID: <0a4c81d8cafdc048fa89c24fcfa4e2715a17d176.1653556865.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1242.git.1653556865.gitgitgadget@gmail.com>

From: Philip Oakley <philipoakley@iee.email>

Since feebd2d256 (rebase: hide --preserve-merges option, 2019-10-18)
this option is now removed as stated in the subsequent release notes.

Fix the option tip.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
---
 builtin/rebase.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 7ab50cda2ad..6ce7e98a6f1 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1110,7 +1110,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 			PARSE_OPT_NOARG | PARSE_OPT_NONEG,
 			parse_opt_interactive),
 		OPT_SET_INT_F('p', "preserve-merges", &preserve_merges_selected,
-			      N_("(DEPRECATED) try to recreate merges instead of "
+			      N_("(REMOVED) try to recreate merges instead of "
 				 "ignoring them"),
 			      1, PARSE_OPT_HIDDEN),
 		OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),
-- 
gitgitgadget


  reply	other threads:[~2022-05-26  9:21 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-26  9:21 [PATCH 0/3] Die preserve ggg Philip Oakley via GitGitGadget
2022-05-26  9:21 ` Philip Oakley via GitGitGadget [this message]
2022-05-26  9:40   ` [PATCH 1/3] rebase.c: state preserve-merges has been removed Ævar Arnfjörð Bjarmason
2022-05-26 11:40     ` Philip Oakley
2022-05-26 13:02     ` René Scharfe
2022-05-26 20:33       ` Junio C Hamano
2022-05-26 21:27         ` René Scharfe
2022-05-26 23:23           ` Junio C Hamano
2022-05-27 12:35           ` Philip Oakley
2022-05-27 12:17         ` Philip Oakley
2022-05-27 15:45           ` Junio C Hamano
2022-05-27 12:12       ` Philip Oakley
2022-05-27 12:34       ` Ævar Arnfjörð Bjarmason
2022-05-26  9:21 ` [PATCH 2/3] rebase: help users when dying with `preserve-merges` Philip Oakley via GitGitGadget
2022-05-26  9:43   ` Ævar Arnfjörð Bjarmason
2022-05-26 11:44     ` Philip Oakley
2022-05-26 20:42       ` Junio C Hamano
2022-05-27 12:58         ` Philip Oakley
2022-05-27 15:54           ` Junio C Hamano
2022-05-26  9:21 ` [PATCH 3/3] rebase: note `preserve` merges may be a pull config option Philip Oakley via GitGitGadget
2022-05-26  9:50   ` Ævar Arnfjörð Bjarmason
2022-05-26 12:01     ` Philip Oakley
2022-05-26 20:55   ` Junio C Hamano
2022-05-27 12:08     ` Philip Oakley
2022-05-26  9:54 ` [PATCH 0/3] Die preserve ggg Ævar Arnfjörð Bjarmason
2022-05-26 12:57   ` Philip Oakley
2022-06-04 11:17 ` [PATCH v2 0/4] " Philip Oakley via GitGitGadget
2022-06-04 11:17   ` [PATCH v2 1/4] rebase.c: state preserve-merges has been removed Philip Oakley via GitGitGadget
2022-06-04 11:17   ` [PATCH v2 2/4] rebase: help users when dying with `preserve-merges` Philip Oakley via GitGitGadget
2022-06-04 11:17   ` [PATCH v2 3/4] rebase: note `preserve` merges may be a pull config option Philip Oakley via GitGitGadget
2022-06-06 17:57     ` Junio C Hamano
2022-06-11 14:03       ` Philip Oakley
2022-06-11 15:38         ` Philip Oakley
2022-06-11 19:22           ` Junio C Hamano
2022-06-04 11:17   ` [PATCH v2 4/4] rebase: translate a die(preserve-merges) message Philip Oakley via GitGitGadget

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=0a4c81d8cafdc048fa89c24fcfa4e2715a17d176.1653556865.git.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=philipoakley@iee.email \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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 NNTP newsgroup(s).