about summary refs log tree commit diff
path: root/git-merge-pr
diff options
context:
space:
mode:
Diffstat (limited to 'git-merge-pr')
-rwxr-xr-xgit-merge-pr3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-merge-pr b/git-merge-pr
index e6f0e5d..4c21751 100755
--- a/git-merge-pr
+++ b/git-merge-pr
@@ -30,7 +30,8 @@ fi
 PATCH="$(mktemp)"
 trap "rm -f $PATCH" INT TERM EXIT
 wget -nv -O "$PATCH" https://github.com/$PROJECT/pull/"$PR".patch
-git am "$@" "$PATCH"
+WHITESPACE="$(git config --get merge-pr.whitespace)"
+git am "--whitespace=${WHITESPACE:-warn}" "$@" "$PATCH"
 
 if [ "$(git config --bool --get merge-pr.autoclose)" = false ]; then
 	exit 0