We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 033400c commit 08dc640Copy full SHA for 08dc640
scripts/apply.sh
@@ -61,7 +61,7 @@ function applyPatch {
61
git reset --hard upstream/upstream
62
echo " Applying patches to $target..."
63
git am --abort >/dev/null 2>&1
64
- if ! git am --3way --ignore-whitespace "$basedir/patches/$patch_folder/"*.patch
+ if ! git am --3way "$basedir/patches/$patch_folder/"*.patch
65
then
66
echo " Something did not apply cleanly to $target."
67
echo " Please review above details and finish the apply then"
0 commit comments