git apply: option to ignore whitespace differences

diff --git a/git-rebase.sh b/git-rebase.sh
index 18bc6946cfa592c11cf7499b1c1ff9a6cb378b26..d741752c7c8f2713a42d82db09c9057f741a7d2d 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -333,6 +333,9 @@ do
                        ;;
                esac
                ;;
+       --ignore-whitespace)
+               git_am_opt="$git_am_opt $1"
+               ;;
        --committer-date-is-author-date|--ignore-date)
                git_am_opt="$git_am_opt $1"
                force_rebase=t