What's the general recommendation on rebasing after creating a merge commit on my branch? I realize rebase has the -p option but it seems like it does a lot of complicated stuff, and it discourages interactive rebase with the option. My situation is simple: I have a topic1 branch that has a few commits on it. During my work, I notice someone else implements a small bug fix that I need. I do a `git merge --no-ff` to force that into my branch as a separate merge commit. After that, I continue my work on my local topic1 branch as usual. When I want latest from master, I do `git rebase master`. However now that I have a merge commit on my branch, things get complicated. What's a good workflow for this, since it seems pretty common? -- 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