Re: Equivalent of "bzr diff -rancestor:"

[Nicolas Richard]

Stefan Monnier <address@hidden> writes:

>>> In Bazaar, I'd do something like "bzr diff -r ancestor:<master>"
>
>> Perhaps you want:
>> git diff origin/foo master
>
> This just shows the diff between the head of both branches.
> Whereas I want the diff between the head of "foo" and the common ancestor
> between "foo" and "master".

Ah, sorry. That is "git diff ...foo"

Quoting "git help diff" :

> git diff [--options] <commit>...<commit> [--] [<path>...]
>            This form is to view the changes on the branch containing and
>            up to the second <commit>, starting at a common ancestor of
>            both <commit>. "git diff A...B" is equivalent to "git diff
>            $(git-merge-base A B) B". You can omit any one of <commit>,
>            which has the same effect as using HEAD instead.



-- 
Nicolas Richard