mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase -i: finishing touches to --reset-author-date

Browse Source 
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>
This commit is contained in:
Junio C Hamano
2019-11-21 15:14:28 +09:00
parent fe28ad8520
commit d82dfa7f5b
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/git-rebase.txt
View File

@ -392,8 +392,10 @@ See also INCOMPATIBLE OPTIONS below.
--ignore-date:: --ignore-date::
--reset-author-date:: --reset-author-date::
Instead of using the given author date, reset it to the By default, the author date of the original commit is used
current time. This implies --force-rebase. 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. See also INCOMPATIBLE OPTIONS below.

6
builtin/rebase.c
View File

@ -1437,9 +1437,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
&options.committer_date_is_author_date, &options.committer_date_is_author_date,
N_("make committer date match author date")), N_("make committer date match author date")),
OPT_BOOL(0, "reset-author-date", &options.ignore_date, OPT_BOOL(0, "reset-author-date", &options.ignore_date,
"ignore author date and use current date"), N_("ignore author date and use current date")),
OPT_BOOL(0, "ignore-date", &options.ignore_date, OPT_HIDDEN_BOOL(0, "ignore-date", &options.ignore_date,
"ignore author date and use current date"), N_("synonym of --reset-author-date")),
OPT_PASSTHRU_ARGV('C', NULL, &options.git_am_opts, N_("n"), OPT_PASSTHRU_ARGV('C', NULL, &options.git_am_opts, N_("n"),
N_("passed to 'git apply'"), 0), N_("passed to 'git apply'"), 0),
OPT_BOOL(0, "ignore-whitespace", &options.ignore_whitespace, OPT_BOOL(0, "ignore-whitespace", &options.ignore_whitespace,