How do I get from this
A -- B -- C [masterbranch, origin/HEAD, origin/master, HEAD]
\
D -- E -- F [tempbranch]
to this:
A -- B -- C -- F [masterbranch ,origin/HEAD, origin/master, HEAD]
\
D -- E [tempbranch]
I don't want to deal with merging, just have 100% from commit F as the end point of my master-branch.
Simply use
git cherry-pick
to apply the commit to your master branch. This commands should produce the desired situation: