From 570ccad33e067616865aa9697b90c7b927d6dcf4 Mon Sep 17 00:00:00 2001 From: Michele Ballabio Date: Wed, 18 Mar 2009 21:53:49 +0100 Subject: [PATCH] rebase: add options passed to git-am Add the options --committer-date-is-author-date and --ignore-date to git-rebase. They were introduced in commit a79ec62d0 for git-am. These options imply --force-rebase. Signed-off-by: Michele Ballabio Signed-off-by: Junio C Hamano --- Documentation/git-rebase.txt | 5 +++++ git-rebase.sh | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 276f1510c6..3d5a066c31 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -270,6 +270,11 @@ OPTIONS (see linkgit:git-apply[1]) that applies the patch. Incompatible with the --interactive option. +--committer-date-is-author-date:: +--ignore-date:: + These flags are passed to 'git-am' to easily change the dates + of the rebased commits (see linkgit:git-am[1]). + -i:: --interactive:: Make a list of the commits which are about to be rebased. Let the diff --git a/git-rebase.sh b/git-rebase.sh index d38ab0b83f..0ade699228 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -309,6 +309,10 @@ do ;; esac ;; + --committer-date-is-author-date|--ignore-date) + git_am_opt="$git_am_opt $1" + force_rebase=t + ;; -C*) git_am_opt="$git_am_opt $1" ;; -- 2.11.4.GIT