summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorMichele Ballabio <barra_cuda@katamail.com>2009-03-18 21:53:49 +0100
committerJunio C Hamano <gitster@pobox.com>2009-03-18 19:25:01 -0700
commit570ccad33e067616865aa9697b90c7b927d6dcf4 (patch)
treed2175cc960aa57e00a8eafc1b8c948730247e9ee /git-rebase.sh
parent5e75d56f1182c99364c9f5375665c814985f384d (diff)
downloadgit-570ccad33e067616865aa9697b90c7b927d6dcf4.tar.gz
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>
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-xgit-rebase.sh4
1 files changed, 4 insertions, 0 deletions
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"
;;