rebase
git rebase pulls in changes from unrelated branch?
In magit, can I interactively rebase onto another branch?
Is it “ok” to commit to detached head after resolving conflicts when rebasing with TortoiseGit?
Related Links
git rebase pulls in changes from unrelated branch?
In magit, can I interactively rebase onto another branch?
Rebasing and debugging
Is it “ok” to commit to detached head after resolving conflicts when rebasing with TortoiseGit?