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>

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 276f1510c600e9535a750beceaa90ec0c8273389..3d5a066c31675e502eb027dde824d1966c9c0f09 100644 (file)
--- 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 d38ab0b83fd46e4b3f7c0e81bc97a4b313925786..0ade6992289a807a268ad887d8a71ba54a87cf49 100755 (executable)
--- 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"
                ;;