Skip to content

Commit

Permalink
rebase -i: finishing touches to --reset-author-date
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
gitster committed Nov 25, 2019
1 parent fe28ad8 commit d82dfa7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
6 changes: 4 additions & 2 deletions Documentation/git-rebase.txt
Expand Up @@ -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.

Expand Down
6 changes: 3 additions & 3 deletions builtin/rebase.c
Expand Up @@ -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,
Expand Down

0 comments on commit d82dfa7

Please sign in to comment.