diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-11-21 15:14:28 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-11-25 15:09:29 +0900 |
| commit | d82dfa7f5b88d57cd4ddaf2c27a7218a39b9dd53 (patch) | |
| tree | 5c324aee519eca33417edb0792e551a1f1e7633f | |
| parent | rebase: add --reset-author-date (diff) | |
| download | git-d82dfa7f5b88d57cd4ddaf2c27a7218a39b9dd53.tar.gz git-d82dfa7f5b88d57cd4ddaf2c27a7218a39b9dd53.zip | |
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>
| -rw-r--r-- | Documentation/git-rebase.txt | 6 | ||||
| -rw-r--r-- | builtin/rebase.c | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index c8d54d221d..03809da835 100644 --- 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 44768082b8..0ddab0bcd2 100644 --- 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, |