diff options
Diffstat (limited to 'REBASE.md')
| -rw-r--r-- | REBASE.md | 20 |
1 files changed, 14 insertions, 6 deletions
@@ -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 ``` |