Patrick Doyle <wpdster@xxxxxxxxx> writes: [...] > Basically, I created a branch off my mainline branch a few days ago. > Made some commits on that branch. Then went back to my mainline > branch, made a few commits there, and now I would like to make my > working copy look like a merge of its current state with the changes > from the branch, minus any associated commits. > > I probably should have just used git-stash to tuck those changes away, > but I didn't. Rather than spending time worrying about optimal ways to do this, wouldn't it work just to do merge (to get the right tree) followed by rebase -i to get the commits in the way you want (removing the merge, anyway)? [...] -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html