Skip to content

Commit fe28ad8

Browse files
r1walzgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 08187b4 commit fe28ad8

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

Documentation/git-rebase.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,7 @@ See also INCOMPATIBLE OPTIONS below.
391391
as the committer date. This implies --force-rebase.
392392

393393
--ignore-date::
394+
--reset-author-date::
394395
Instead of using the given author date, reset it to the
395396
current time. This implies --force-rebase.
396397
+

builtin/rebase.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1436,6 +1436,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
14361436
OPT_BOOL(0, "committer-date-is-author-date",
14371437
&options.committer_date_is_author_date,
14381438
N_("make committer date match author date")),
1439+
OPT_BOOL(0, "reset-author-date", &options.ignore_date,
1440+
"ignore author date and use current date"),
14391441
OPT_BOOL(0, "ignore-date", &options.ignore_date,
14401442
"ignore author date and use current date"),
14411443
OPT_PASSTHRU_ARGV('C', NULL, &options.git_am_opts, N_("n"),

0 commit comments

Comments
 (0)