From d1ccf0e1d4b0826a56b7108a885f247245de6d29 Mon Sep 17 00:00:00 2001 From: ptrcnull Date: Mon, 25 Jul 2022 07:43:52 +0200 Subject: [PATCH] feat: announce the wiggling --- apatch | 1 + 1 file changed, 1 insertion(+) diff --git a/apatch b/apatch index 5cf8989..08e68a2 100755 --- a/apatch +++ b/apatch @@ -41,6 +41,7 @@ done git apply --reject --whitespace=fix "$patchpath" || { git status --porcelain | grep '\?\? .*\.rej$' | cut -c4- | while read -r reject; do target="${reject%.rej}" + echo "[*] trying to wiggle $target" wiggle --merge --replace "$target" "$reject" || { echo "[!] could not merge $target, fix manually" }