From: Michele Ballabio Date: Wed, 18 Mar 2009 20:53:49 GMT Subject: [PATCH v2 3/3] rebase: add options passed to git-am Message-ID: <1237409629-4289-1-git-send-email-barra_cuda@katamail.com> In-Reply-To: <7v1vsufzbs.fsf@gitster.siamese.dyndns.org> 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 --- Documentation/git-rebase.txt | 5 +++++ git-rebase.sh | 4 ++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 276f151..3d5a066 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 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