diff options
| author | ivan-boikov <ik.boikov.public@protonmail.com> | 2024-08-18 17:24:54 +0200 |
|---|---|---|
| committer | ivan-boikov <ik.boikov.public@protonmail.com> | 2024-08-18 17:28:33 +0200 |
| commit | 61029ae812d611ce16f01b3b1bea38e21dba2ee2 (patch) | |
| tree | fd50d384215fc750714411ad9167c9e25ead81e2 /patches | |
| parent | f7558156a2ecb03f1c8786255b113f1ee9ceafe4 (diff) | |
Apply patches on patches branch
Diffstat (limited to 'patches')
| -rwxr-xr-x | patches/dwmpatch | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/patches/dwmpatch b/patches/dwmpatch index df27781..59060c4 100755 --- a/patches/dwmpatch +++ b/patches/dwmpatch @@ -26,12 +26,14 @@ branches=$(git for-each-ref --format='%(refname:short)' refs/heads/ | grep diff) for branch in $branches; do git branch -D $branch || exit done +# branc with merged patches +git branch -D patched -git checkout -b "patched" || git switch "patched" git status for patchfile in *.diff; do + git switch -q "patches" apply_patch "$patchfile" || (git switch "patches" && exit) - git switch -q "patched" done +git checkout -b "patched" echo "Merge patch branches manually now" |
