Skip to content

Instantly share code, notes, and snippets.

View alesya-h's full-sized avatar

Alesya Huzik alesya-h

128 followers · 71 following
View GitHub Profile
@alesya-h
alesya-h / git-imerge rebase through merges.md
Last active January 19, 2023 16:39
Turn a fork that has periodic merges of upstream into easily upstreamable rebaseable linear history

Turn a fork that has periodic merges of upstream into easily upstreamable rebaseable linear history (git-imerge rebase through merges)

find commits

git log origin/main..my_fork_with_periodic_merges

mark commits