Re: git-feed-mail-list.sh

From: Bertrand Jacquin <beber.mailing@gmail.com>
Date: May 9, 2006, 01:09 UTC
Message-ID: <4fb292fa0605081809r6aa76baai5eac9823183fc3fc@mail.gmail.com>
In-Reply-To: <7vac9sc8m3.fsf@assigned-by-dhcp.cox.net>

On 5/9/06, Junio C Hamano <junkio@cox.net> wrote:

Show 20 quoted lines

> "Bertrand Jacquin" <beber.mailing@gmail.com> writes:
>
> > Is there a way to track merge like that?
>
> The command line you quoted shows the relevant information for
> people who want to know what happened in that merge.
>
> Namely:
>
>  * it always shows the header and the message
>
>  * it shows the changes that are not trivial (i.e. merge parents
>    have overlapping different versions and manual resolution
>    resulted in something different from either parents).
>
> It is not a replacement for format-patch, but I think the commit
> mailing list is not for machines to receive and apply the
> received patches, but for humans to inspect, so it would be more
> suitable than a naive alternative of showing diff from all
> parents concatenated together.

That's right. And don't want to do that.

But I would like to send an email after merge to inform people that:

o tree ``a'' and ``b'' have been merged. o made by John Doe at a time o show a diffstat. o show a --short-log=oneline from merge base.

-- Beber #e.fr@freenode