git apply: option to ignore whitespace differences

diff --git a/git-pull.sh b/git-pull.sh
index 3cf26634adbc3cb2a7d63b4f03cfac7e8fd96f59..4b78a0cd37ba70236a05f78fb5bed3f763348096 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -173,13 +173,11 @@ case "$merge_head" in
 ?*' '?*)
        if test -z "$orig_head"
        then
-               echo >&2 "Cannot merge multiple branches into empty head"
-               exit 1
+               die "Cannot merge multiple branches into empty head"
        fi
        if test true = "$rebase"
        then
-               echo >&2 "Cannot rebase onto multiple branches"
-               exit 1
+               die "Cannot rebase onto multiple branches"
        fi
        ;;
 esac