From 26a2575603b9f7a3c2b05ee61433b647540e6276 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Fri, 17 Feb 2017 17:33:07 +0100 Subject: [PATCH] Add --keep-cr parameter to "git am" * Fixes applying masquerade patches --- patch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patch.sh b/patch.sh index 9752206..fd43702 100755 --- a/patch.sh +++ b/patch.sh @@ -17,7 +17,7 @@ REPOSITORIES=( for repository in "${REPOSITORIES[@]}"; do cd "${ROOT}/${repository}" - git am "${ROOT}/vendor/extra/patches/${repository}"/* + git am --keep-cr "${ROOT}/vendor/extra/patches/${repository}"/* cd "${ROOT}" done -- 2.20.1