Skip to content

Instantly share code, notes, and snippets.

View madeddy's full-sized avatar
:electron:
Respond possible slow

madeddy

:electron:
Respond possible slow
View GitHub Profile
@madeddy
madeddy / branch-fu.md
Created March 13, 2021 11:50 — forked from unbracketed/branch-fu.md
Moving commits between branches

Example: Moving up to a few commits to another branch

Branch A has commits (X,Y) that also need to be in Branch B. The cherry-pick operations should be done in the same chronological order that the commits appear in Branch A.

cherry-pick does support a range of commits, but if you have merge commits in that range, it gets really complicated

git checkout branch-B
git cherry-pick X
git cherry-pick Y