rebase: add --reset-author-date
The previous commit introduced --ignore-date flag to interactive rebase, but the name is actually very vague in context of rebase -i since there are two dates we can work with. Add an alias to convey the precise purpose. Signed-off-by: Rohit Ashiwal <rohit.ashiwal265@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
08187b4cba
commit
fe28ad8520
@ -391,6 +391,7 @@ See also INCOMPATIBLE OPTIONS below.
|
|||||||
as the committer date. This implies --force-rebase.
|
as the committer date. This implies --force-rebase.
|
||||||
|
|
||||||
--ignore-date::
|
--ignore-date::
|
||||||
|
--reset-author-date::
|
||||||
Instead of using the given author date, reset it to the
|
Instead of using the given author date, reset it to the
|
||||||
current time. This implies --force-rebase.
|
current time. This implies --force-rebase.
|
||||||
+
|
+
|
||||||
|
@ -1436,6 +1436,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
|||||||
OPT_BOOL(0, "committer-date-is-author-date",
|
OPT_BOOL(0, "committer-date-is-author-date",
|
||||||
&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,
|
||||||
|
"ignore author date and use current date"),
|
||||||
OPT_BOOL(0, "ignore-date", &options.ignore_date,
|
OPT_BOOL(0, "ignore-date", &options.ignore_date,
|
||||||
"ignore author date and use current date"),
|
"ignore author date and use current date"),
|
||||||
OPT_PASSTHRU_ARGV('C', NULL, &options.git_am_opts, N_("n"),
|
OPT_PASSTHRU_ARGV('C', NULL, &options.git_am_opts, N_("n"),
|
||||||
|
Loading…
Reference in New Issue
Block a user