[PATCH v3 3/3] rebase: add options passed to git-am

From

Michele Ballabio <barra_cuda@katamail.com>

Date

Mar 19, 2009, 15:28 UTC

Message-ID

<1237476528-6040-2-git-send-email-barra_cuda@katamail.com>

In-Reply-To

<fabb9a1e0903190401k1127dc8ev7704c8a7bd381c99@mail.gmail.com>

Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
---
 Documentation/git-rebase.txt |    6 ++++++
 git-rebase.sh                |    4 ++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 7ffeec8..592ec76 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -272,6 +272,12 @@ OPTIONS
 	If the flag `fix` (or its equivalent `strip`) is used, it implies
 	--force-rebase.
 
+--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]).
+	Both imply --force-rebase.
+
 -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 e38d68a..b83fd3f 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"
 		;;

-- 
1.6.2.22.gc2ac