Re: Diff topic branch + working copy changes?
- Date: Wed, 17 May 2017 11:47:28 +0900
- From: Junio C Hamano <gitster@xxxxxxxxx>
- Subject: Re: Diff topic branch + working copy changes?
Robert Dailey <rcdailey.lists@xxxxxxxxx> writes:
> So for a topic branch based on master, I can diff ONLY my changes on
> the topic branch by doing this simple command:
> $ git diff origin/master...
> However, this does not include uncommitted working copy changes. To
> work around this, I can do this instead:
> $ git diff origin/master
> (No three-dot notation above)
> However this implies a ".." notation which will include changes on
> master that have been made after I branched my topic (I use three-dot
> to exclude those).
> Is there a way I can do the first diff but also include working copy
I've wished this a few times, but the answer is no. Not as a
short-hand like "..." anyway.
You can still do
$ git diff $(git merge-base origin/master HEAD)