From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 05 Nov 2011 23:53:14 GMT
Subject: Re: How do I get a squashed diff for review
Message-ID: <7vobwq86tx.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CAH_EFyYUja4cKY5YM4Uqn-bnQZCnhnJCNsxGsUitL+SSqj9qxQ@mail.gmail.com>

Alexander Usov <a.s.usov@gmail.com> writes:

> Consider the following history:
>
> master: A---B---D---F
>             \    \
> branch:      .-C--E--G
>
> ...
> - "git diff D..branch" would do a trick, but I'm not sure how to
> correctly determine
> D (if I'm to write a script).

D is the merge-base between F and G. So "git diff $(git merge-base F G) G"
would compare D and G.

Modern git lets you write it as "git diff F...G" as this is a fairly
useful short-hand.