I have two branches, master and table, both went through some changes and
have their respective tracking brances:

M1! - M2! - M3!
   \-T1! - T2! - T3 - T4

commits marked with ! are pushed upstream. I'd like to merge master into
table, and rebase my local commits (T3 and T4) on top of the result. How
can I do that? I was thinking about "saving" T4 as a tmp branch, resetting
table to origin/table, but here I lost my track, as I don't know how to
apply those local commits on my new merge commit.

Thanks in advance!


You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to