Subject: Re: [PATCH v5 0/6] rebase -i: support more options

From: Junio C Hamano <[email-masked]>
Date: Thu, 21 Nov 2019 15:14:28 +0900

As I hate to leave a mostly done topic hanging around forever, I am
tempted to queue these fixups on top (instead of squash them in) to
tie the loose ends after a few weeks' inactivity.

Thanks.

-- >8 --
Subject: rebase -i: finishes touches to --reset-author-date

Clarify the way the `--reset-author-date` option is described,
and mark its usage string translatable.

Signed-off-by: Junio C Hamano <[email-masked]>
---
 Documentation/git-rebase.txt | 6 ++++--
 builtin/rebase.c             | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index c8d54d221d..03809da835 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -392,8 +392,10 @@ See also INCOMPATIBLE OPTIONS below.
 
 --ignore-date::
 --reset-author-date::
-	Instead of using the given author date, reset it to the
-	current time. This implies --force-rebase.
+	By default, the author date of the original commit is used
+	as the author date for the resulting commit.  This option
+	tells Git to use the current timestamp instead and implies
+	`--force-rebase`.
 +
 See also INCOMPATIBLE OPTIONS below.
 
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 44768082b8..d5c09f159c 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1437,9 +1437,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 			 &options.committer_date_is_author_date,
 			 N_("make committer date match author date")),
 		OPT_BOOL(0, "reset-author-date", &options.ignore_date,
-			 "ignore author date and use current date"),
-		OPT_BOOL(0, "ignore-date", &options.ignore_date,
-			 "ignore author date and use current date"),
+			 N_("ignore author date and use current date")),
+		OPT_HIDDEN_BOOL(0, "ignore-date", &options.ignore_date,
+				N_("synonym of --reset-autohr-date")),
 		OPT_PASSTHRU_ARGV('C', NULL, &options.git_am_opts, N_("n"),
 				  N_("passed to 'git apply'"), 0),
 		OPT_BOOL(0, "ignore-whitespace", &options.ignore_whitespace,