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 <barra_cuda@katamail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michele Ballabio committed
Mar 18, 2009 at 21:53 UTC
570ccad33e067616865aa9697b90c7b927d6dcf4
2 files changed
+9
Documentation/git-rebase.txt
+5
@@ -270,6 +270,11 @@ OPTIONS
270
(see linkgit:git-apply[1]) that applies the patch.
271
Incompatible with the --interactive option.
272
273
+--committer-date-is-author-date::
274
+--ignore-date::
275
+ These flags are passed to 'git-am' to easily change the dates
276
+ of the rebased commits (see linkgit:git-am[1]).
277
+
278
-i::
279
--interactive::
280
Make a list of the commits which are about to be rebased. Let the
git-rebase.sh
+4
@@ -309,6 +309,10 @@ do
309
;;
310
esac
311
;;
312
+ --committer-date-is-author-date|--ignore-date)
313
+ git_am_opt="$git_am_opt $1"
314
+ force_rebase=t
315
+ ;;
316
-C*)
317
git_am_opt="$git_am_opt $1"
318
;;