Skip to content

Commit d82dfa7

Browse files
committed
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 <[email protected]>
1 parent fe28ad8 commit d82dfa7

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

Documentation/git-rebase.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,8 +392,10 @@ See also INCOMPATIBLE OPTIONS below.
392392

393393
--ignore-date::
394394
--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`.
397399
+
398400
See also INCOMPATIBLE OPTIONS below.
399401

builtin/rebase.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1437,9 +1437,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
14371437
&options.committer_date_is_author_date,
14381438
N_("make committer date match author date")),
14391439
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")),
14431443
OPT_PASSTHRU_ARGV('C', NULL, &options.git_am_opts, N_("n"),
14441444
N_("passed to 'git apply'"), 0),
14451445
OPT_BOOL(0, "ignore-whitespace", &options.ignore_whitespace,

0 commit comments

Comments
 (0)