diff options
| -rwxr-xr-x | git-merge-pr | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-pr b/git-merge-pr index 4c21751..cffde3a 100755 --- a/git-merge-pr +++ b/git-merge-pr @@ -30,7 +30,7 @@ fi PATCH="$(mktemp)" trap "rm -f $PATCH" INT TERM EXIT wget -nv -O "$PATCH" https://github.com/$PROJECT/pull/"$PR".patch -WHITESPACE="$(git config --get merge-pr.whitespace)" +WHITESPACE="$(git config --get merge-pr.whitespace || true)" git am "--whitespace=${WHITESPACE:-warn}" "$@" "$PATCH" if [ "$(git config --bool --get merge-pr.autoclose)" = false ]; then |