Re: [PATCH] octopus: make merge process simpler to follow

From: Junio C Hamano <gitster@pobox.com>
Date: Dec 15, 2009, 07:32 UTC
Message-ID: <7v3a3c3d5p.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1260859755-3990-1-git-send-email-bebarino@gmail.com>

Stephen Boyd <bebarino@gmail.com> writes:

Show 9 quoted lines

> Its not very easy to understand what heads are being merged given
> the current output of an octopus merge. Fix this by replacing the
> sha1 with the (usually) better description in GITHEAD_<SHA1>.
>
> Suggested-by: Jari Aalto <jari.aalto@cante.net>
> Signed-off-by: Stephen Boyd <bebarino@gmail.com>
> ---
>
> Thanks both. Here's a replacement. Let me know if you want a reroll.

Ah, thanks and sorry for having you do an extra work. I amended the assignment further like thi,s but haven't got a chance to push the result out...

	eval pretty_name=\${GITHEAD_$SHA1:-$SHA1}