diff options
| author | Matthias von Faber <mvf@gmx.eu> | 2017-08-29 19:45:50 +0200 |
|---|---|---|
| committer | Leah Neukirchen <leah@vuxu.org> | 2017-09-01 13:58:21 +0200 |
| commit | 18358994a4fe67a0362a2805c5cc9da05316811b (patch) | |
| tree | e3196241022c5cbdd789bf6d68d61d2c3990e0b5 | |
| parent | f20f8ab371ad2cd8d49a9eddad1c967aed81572c (diff) | |
| download | git-merge-pr-18358994a4fe67a0362a2805c5cc9da05316811b.tar.gz git-merge-pr-18358994a4fe67a0362a2805c5cc9da05316811b.tar.xz git-merge-pr-18358994a4fe67a0362a2805c5cc9da05316811b.zip | |
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]
| -rwxr-xr-x | git-merge-pr | 3 |
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 |