From mboxrd@z Thu Jan  1 00:00:00 1970
From: =?ISO-8859-1?Q?S=F8ren?= Holm <sgh@sgh.dk>
Subject: commit-msg hook and merges
Date: Wed, 29 Jan 2014 11:38:37 +0100
Message-ID: <2590624.EqnRJC0pBH@koontz>
Mime-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: QUOTED-PRINTABLE
To: git@vger.kernel.org
X-From: git-owner@vger.kernel.org Wed Jan 29 11:43:56 2014
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git-2@plane.gmane.org
Received: from vger.kernel.org ([209.132.180.67])
	by plane.gmane.org with esmtp (Exim 4.69)
	(envelope-from <git-owner@vger.kernel.org>)
	id 1W8ScX-0003b0-B7
	for gcvg-git-2@plane.gmane.org; Wed, 29 Jan 2014 11:43:49 +0100
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751144AbaA2Knp convert rfc822-to-quoted-printable (ORCPT
	<rfc822;gcvg-git-2@m.gmane.org>); Wed, 29 Jan 2014 05:43:45 -0500
Received: from mx06.stofanet.dk ([212.10.10.58]:44945 "EHLO mx06.stofanet.dk"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1750901AbaA2Knp convert rfc822-to-8bit (ORCPT
	<rfc822;git@vger.kernel.org>); Wed, 29 Jan 2014 05:43:45 -0500
X-Greylist: delayed 304 seconds by postgrey-1.27 at vger.kernel.org; Wed, 29 Jan 2014 05:43:44 EST
Received: from 5634f347.rev.stofanet.dk ([86.52.243.71] helo=asrock)
	by mx-aarh-1.stofanet.dk (envelope-from
	<sgh@sgh.dk>)
	with esmtp id 1W8SXW-00028A-1a
	for git@vger.kernel.org; Wed, 29 Jan 2014 11:38:38 +0100
Received: from koontz.localnet (localhost [127.0.0.1])
	by asrock (Postfix) with ESMTPS id 93A2D7EEC0
	for <git@vger.kernel.org>; Wed, 29 Jan 2014 11:38:37 +0100 (CET)
User-Agent: KMail/4.12.1 (Linux/3.11.0-11-lowlatency; KDE/4.12.1; i686; ; )
Sender: git-owner@vger.kernel.org
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/241203>

Hi.=20

I'm running a speciallized commit-msg hook to help me fill out commit=20
messages. This all works nicely for alle commits except for merges.

What I normally do to circumvent this is this :

$ git merge somebranch

<here I append to autogenerated message with my own text>

$ git commit --ammend

<I just save the message without changes and the commit-message is run=20
throught my filter>


Is that intentional or an error ?

--=20
S=F8ren Holm