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>

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index c8d54d221d9fca1718ad5b14e6f744a00d772d4c..03809da835e49a82bac62edfda923fe918f119ce 100644 (file)
--- 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 44768082b88d0eaf1ab1f78584bb8eb4d234c6e0..0ddab0bcd27936e97e977520c6c72dfbf4909c4a 100644 (file)
--- 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-author-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,