From: Steffen Prohaska <prohaska@zib.de>
Date: Mon, 30 Jul 2007 07:44:03 GMT
Subject: Re: merge time
Message-ID: <E49A2B0B-DAA3-4A03-925D-D3D113F907F1@zib.de>
In-Reply-To: <7vbqdumlo1.fsf@assigned-by-dhcp.cox.net>


On Jul 30, 2007, at 8:48 AM, Junio C Hamano wrote:

> I tend to agree that it would make sense to allow something like:
>
>     $ git merge --no-fast-forward -m 'Merge topic XYZ' xyz

Another option could be to force a commit before the merge, even
if there are no changes to commit, something like

     $ git commit --force -m 'MARK'

[to my knowledge, --force or similar is not yet available]

	Steffen