diff --git a/apatch b/apatch index 7814d16..5cf8989 100755 --- a/apatch +++ b/apatch @@ -38,7 +38,7 @@ done # if file exists, try to apply if [ -e "$patchpath" ]; then - git apply --reject --quiet --whitespace=fix "$patchpath" || { + git apply --reject --whitespace=fix "$patchpath" || { git status --porcelain | grep '\?\? .*\.rej$' | cut -c4- | while read -r reject; do target="${reject%.rej}" wiggle --merge --replace "$target" "$reject" || {