From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 15 Feb 2011 21:36:39 GMT
Subject: Re: [PATCH] merge: honor prepare-commit-msg hook
Message-ID: <7voc6dm13s.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1297732070-32704-1-git-send-email-jaysoffian@gmail.com>

Jay Soffian <jaysoffian@gmail.com> writes:

> When a merge is stopped due to conflicts or --no-commit, the
> subsequent commit calls the prepare-commit-msg hook. However,
> it is not called after a clean merge. Fix this inconsistency
> by invoking the hook after clean merges as well.
>
> Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
> ---
> I sent this out previously as an RFC:
>
>   http://thread.gmane.org/gmane.comp.version-control.git/151297
>
> But never prepared a proper patch. Here it is.

Looks very sensible.  Thanks.

Will queue.