Merge branch 'jc/maint-1.6.0-blame-s'

[git.git] / git-rebase.sh

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"
                ;;