rebase -i: finishing 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 <gitster@pobox.com>
Junio C Hamano committed
Nov 21, 2019 at 15:14 UTC
d82dfa7f5b88d57cd4ddaf2c27a7218a39b9dd53
2 files changed
+7
-5
Documentation/git-rebase.txt
+4
-2
@@ -392,8 +392,10 @@ See also INCOMPATIBLE OPTIONS below.
392
393
--ignore-date::
394
--reset-author-date::
395
- Instead of using the given author date, reset it to the
396
- current time. This implies --force-rebase.
395
+ By default, the author date of the original commit is used
396
+ as the author date for the resulting commit. This option
397
+ tells Git to use the current timestamp instead and implies
398
+ `--force-rebase`.
399
+
400
See also INCOMPATIBLE OPTIONS below.
401
builtin/rebase.c
+3
-3
@@ -1437,9 +1437,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
1437
&options.committer_date_is_author_date,
1438
N_("make committer date match author date")),
1439
OPT_BOOL(0, "reset-author-date", &options.ignore_date,
1440
- "ignore author date and use current date"),
1441
- OPT_BOOL(0, "ignore-date", &options.ignore_date,
1442
- "ignore author date and use current date"),
1440
+ N_("ignore author date and use current date")),
1441
+ OPT_HIDDEN_BOOL(0, "ignore-date", &options.ignore_date,
1442
+ N_("synonym of --reset-author-date")),
1443
OPT_PASSTHRU_ARGV('C', NULL, &options.git_am_opts, N_("n"),
1444
N_("passed to 'git apply'"), 0),
1445
OPT_BOOL(0, "ignore-whitespace", &options.ignore_whitespace,