diff options
| -rw-r--r-- | Documentation/git-rebase.txt | 1 | ||||
| -rw-r--r-- | builtin/rebase.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 9a1eabad0f..c8d54d221d 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -391,6 +391,7 @@ See also INCOMPATIBLE OPTIONS below. as the committer date. This implies --force-rebase. --ignore-date:: +--reset-author-date:: Instead of using the given author date, reset it to the current time. This implies --force-rebase. + diff --git a/builtin/rebase.c b/builtin/rebase.c index b7d3de1a0f..44768082b8 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1436,6 +1436,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) OPT_BOOL(0, "committer-date-is-author-date", &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"), OPT_PASSTHRU_ARGV('C', NULL, &options.git_am_opts, N_("n"), |