diff options
| author | ivan-boikov <ik.boikov.public@protonmail.com> | 2024-08-18 14:04:33 +0200 |
|---|---|---|
| committer | ivan-boikov <ik.boikov.public@protonmail.com> | 2024-08-18 17:01:02 +0200 |
| commit | 2307403fb5e6d5490cea62fdc332a07056713c7f (patch) | |
| tree | ec436b2ae23c6ac17b2ac337b24964c63809f933 | |
| parent | 29e5ab38b59e04eda8a23b700bbbad1bdce4a466 (diff) | |
Autoswitch to patches on merge fail
| -rwxr-xr-x | patches/dwmpatch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/patches/dwmpatch b/patches/dwmpatch index 2dc0575..91f3e79 100755 --- a/patches/dwmpatch +++ b/patches/dwmpatch @@ -31,7 +31,7 @@ git branch -D patched git checkout -b "patched" for patchfile in *.diff; do - apply_patch "$patchfile" || exit + apply_patch "$patchfile" || (git switch "patches" && exit) git switch -q "patched" done |