[GSoC][PATCH v2 6/6] rebase: add --author-date-is-committer-date
- From
Rohit Ashiwal <rohit.ashiwal265@gmail.com>
- Date
- Aug 20, 2019, 03:45 UTC
- Message-ID
- <20190820034536.13071-7-rohit.ashiwal265@gmail.com>
- In-Reply-To
- <20190820034536.13071-1-rohit.ashiwal265@gmail.com>
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> --- Documentation/git-rebase.txt | 1 + builtin/rebase.c | 2 ++ 2 files changed, 3 insertions(+)
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 24ad2dda0b..6a52d721e2 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -388,6 +388,7 @@ See also INCOMPATIBLE OPTIONS below. as the committer date. This implies --force-rebase. --ignore-date:: +--author-date-is-committer-date:: Instead of using the given author date, re-set it to the value same as committer (current) date. This implies --force-rebase. + diff --git a/builtin/rebase.c b/builtin/rebase.c index ed58ca8e5a..19b1fc0f3a 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1442,6 +1442,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, "author-date-is-committer-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"),
-- 2.21.0