Thread (3 messages) flat view 3 messages, 2 authors, 2016-08-24

Re: diff <commit> using 3-dot behavior

From: Robert Dailey <hidden>
Date: 2016-08-24 16:11:02

On Wed, Aug 24, 2016 at 11:00 AM, Michael J Gruber
[off-list ref] wrote:
The 3-dot notation means:

Show the difference between the merge-base of master and topic, and topic.

I'm not completely sure, but I guess what you want is:

Show the difference between the merge-base of master and topic, and the
worktree.

You can accomplish this with:

git diff $(git merge-base master topic)

I guess a shorter notation for that could come in handy. OTOH, I usually
diff against HEAD in a situation like that.
Great solution. I feel silly now, the answer ended up being rather
obvious. I can create an alias for that. But I can't diff against HEAD
because then I am not seeing a diff of changes already committed.
Thanks for your help.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help