diff options
| -rwxr-xr-x | git-merge-pr | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-merge-pr b/git-merge-pr index 03259b7..992baba 100755 --- a/git-merge-pr +++ b/git-merge-pr @@ -17,7 +17,7 @@ PROJECT=${PROJECT##*:} PROJECT=${PROJECT#//github.com/} if command -v wget >/dev/null; then - API_CMD="wget -q -O --header" + API_CMD="wget -q -O- --header" PATCH_CMD="wget -nv -O" elif command -v curl >/dev/null; then API_CMD="curl -s -H" @@ -42,7 +42,7 @@ PATCH="$(mktemp)" trap "rm -f $PATCH" INT TERM EXIT $PATCH_CMD "$PATCH" https://github.com/$PROJECT/pull/"$PR".patch WHITESPACE="$(git config --get merge-pr.whitespace || true)" -git am "--whitespace=${WHITESPACE:-warn}" "$@" "$PATCH" +git am --keep-cr "--whitespace=${WHITESPACE:-warn}" "$@" "$PATCH" if [ "$(git config --bool --get merge-pr.autoclose)" = false ]; then exit 0 |