On Fri, Aug 19, 2016 at 09:19:44PM +0000, Eric Wong wrote:
quoted
I've rebased my changes. Unfortunately, having 3 commits made this somewhat
tedious. I also find it weird that my new patch set makes it difficult to see
what changes I've made from my first set. What's the standard workflow here?
I check out a new branch with the same base as the previous series
and "git diff previous current"
(without git, I'd be using interdiff from the patchutils Debian package)
Sometimes I will rebase against both old+new against Junio's master
to avoid/reduce conflicts.
You might also try Thomas Rast's topic-branch diff:
https://github.com/trast/tbdiff
It gives better patch-by-patch differences. And it handles the case that
the topics have different bases (which is handy if you've rebased, or if
Junio happened to apply on a different base than you did).
-Peff