diff options
| author | Rohit Ashiwal <rohit.ashiwal265@gmail.com> | 2020-08-17 17:40:04 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-19 22:22:56 (GMT) |
| commit | 27126692ba1688081d8427220087bb7662594bd9 (patch) | |
| tree | 2b01a2bcfc418c75abe7d34e00ebf6f6e1424be6 /builtin/rebase.c | |
| parent | a3894aad67df655a9c7f3b511093f681d3a01fb7 (diff) | |
| download | git-27126692ba1688081d8427220087bb7662594bd9.zip git-27126692ba1688081d8427220087bb7662594bd9.tar.gz git-27126692ba1688081d8427220087bb7662594bd9.tar.bz2 | |
rebase: add --reset-author-date
The previous commit introduced --ignore-date flag to rebase -i, but the
name is rather vague as it does not say whether the author date or the
committer date is ignored. Add an alias to convey the precise purpose.
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/rebase.c')
| -rw-r--r-- | builtin/rebase.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 583ac96..b126fbe 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1505,8 +1505,10 @@ 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, "ignore-date", &options.ignore_date, + OPT_BOOL(0, "reset-author-date", &options.ignore_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", &ignore_whitespace, |