From 18358994a4fe67a0362a2805c5cc9da05316811b Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Tue, 29 Aug 2017 19:45:50 +0200
Subject: add merge-pr.whitespace config, defaults to warn

We don't want a custom apply.whitespace to be used for merge-pr.

Closes: #1 [via git-merge-pr]
---
 git-merge-pr | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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
-- 
cgit 1.4.1