Merge branch 'maint'

[git.git] / git-rebase.sh

diff --git a/git-rebase.sh b/git-rebase.sh
index 058fcacb7eea33128436fa04c0412370562e9ff0..1583402a060793c25e49c3446c2a35fe27101883 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -215,9 +215,11 @@ do
        -v|--verbose)
                verbose=t
                ;;
+       --whitespace=*)
+               git_am_opt="$git_am_opt $1"
+               ;;
        -C*)
-               git_am_opt=$1
-               shift
+               git_am_opt="$git_am_opt $1"
                ;;
        -*)
                usage