┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConway <[email protected]>2026-06-04 17:56:24 -0400
committerConway <[email protected]>2026-06-04 17:58:24 -0400
commit8fb5c91e170d8cf25659454443ec332cf0599f4a (patch)
tree59c3afefe91e2e3c50b6bfd749a1bba1336e8d96
parent4efbed4e6ad8bfd672a87afee8fd2c3bcd5f44cc (diff)
REBASE.md: generalize patch regen for multiple feature commitspixelated-scaling-option
The previous recipe grep'd for a single 'pixel scaling and filename' commit, which silently dropped any other feature commits (e.g. the KItemListWidget selection-alpha bump). Replace it with a loop that cherry-picks every branch-only commit touching src/, in order.
-rw-r--r--REBASE.md20
1 files changed, 14 insertions, 6 deletions
diff --git a/REBASE.md b/REBASE.md
index 02dd12c85..544f527a9 100644
--- a/REBASE.md
+++ b/REBASE.md
@@ -1,8 +1,9 @@
# Rebase workflow
-This branch (`pixelated-scaling-option`) carries one feature commit on top
-of upstream KDE Dolphin (pixelated thumbnail scaling + hide-file-extensions).
-This file is only on this branch, never on `master`.
+This branch (`pixelated-scaling-option`) carries our feature commits on
+top of upstream KDE Dolphin (pixelated thumbnail scaling, hide-file
+extensions, selection-highlight alpha bump, etc.). This file is only on
+this branch, never on `master`.
## Layout
@@ -50,12 +51,19 @@ Pick the latest (e.g. `v26.08.0`). KDE only keeps recent tarballs on
### 4. Regenerate the patch against that tag
```
-FEATURE_SHA=$(git log --grep='pixel scaling and filename' -n 1 --format=%H pixelated-scaling-option)
TAG=v26.08.0 # whatever you picked
git checkout --detach "$TAG"
-git cherry-pick "$FEATURE_SHA"
-git diff HEAD~1 HEAD > ~/Documents/Repositories/arch-dolphin/pixelated-scaling-and-hide-extensions.patch
+
+# Cherry-pick every branch-only feature commit, in chronological order.
+# Filtering by `-- src/` excludes the REBASE.md doc commit (it lives at
+# repo root). Any future commit that touches src/ on this branch will be
+# picked up automatically — no per-commit edits needed here.
+for sha in $(git log --reverse --format=%H master..pixelated-scaling-option -- src/); do
+ git cherry-pick "$sha"
+done
+
+git diff "$TAG"..HEAD > ~/Documents/Repositories/arch-dolphin/pixelated-scaling-and-hide-extensions.patch
git checkout pixelated-scaling-option
```