feat: announce the wiggling
This commit is contained in:
parent
fbaf178502
commit
d1ccf0e1d4
1 changed files with 1 additions and 0 deletions
1
apatch
1
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"
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue