diff options
Diffstat (limited to 'git-merge-pr')
| -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 6ec6203..992baba 100755 --- a/git-merge-pr +++ b/git-merge-pr @@ -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 |