On Wed, Aug 24, 2016 at 01:48:30PM -0700, Jacob Keller wrote: > On Wed, Aug 24, 2016 at 9:22 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > > The merge-base is to compute the point you forked your topic from > > the mainline. So if you want to compare your current state in the > > index with the fork point, you'd do > > > > git diff --cached $(git merge-base master topic) > > > > and comparing your working tree state would be > > > > git diff --cached $(git merge-base master topic) > > > > Those are both identical? I imagine the second one just meant to drop "--cached". -Peff -- 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