Rolling stable kernels

Posted Oct 8, 2021 0:18 UTC (Fri) by amboar (subscriber, #55307)
In reply to: Rolling stable kernels by pbonzini
Parent article: Rolling stable kernels

Playing git-golf a bit here, but this can be done in one operation with `git merge -s ours 5.15.1`. As I was reading the article I thought it sounded awfully similar to something I blogged recently: https://amboar.github.io/notes/2021/09/16/history-preserv...

Rolling stable kernels

Posted Oct 8, 2021 0:28 UTC (Fri) by amboar (subscriber, #55307) [Link] (2 responses)

Ugh, that should have been the other way around with respect to the branch state and merged tag, but the important bit was the existence of the "ours" merge strategy :)

Rolling stable kernels

Posted Oct 8, 2021 7:12 UTC (Fri) by pbonzini (subscriber, #60935) [Link] (1 responses)

Yes, exactly. What one would need here is a "theirs" merge strategy, but it doesn't exist.

Rolling stable kernels

Posted Mar 29, 2023 19:34 UTC (Wed) by tsaeger (subscriber, #116881) [Link]

I git-golf from time-to-time :)

# git merge -s "theirs"
THEIRS=v5.15.1
git merge -s ours --no-commit "${THEIRS}"
git read-tree -u --reset "${THEIRS}"
git commit --no-edit