From: Junio C Hamano <junkio@cox.net>
Date: Fri, 29 Jul 2005 02:24:57 GMT
Subject: Re: [PATCH] add "-f" option to git-commit-script to force commit withoutchanges
Message-ID: <7vslxypcw6.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <Pine.LNX.4.58.0507281646340.25783@wgmdd8.biozentrum.uni-wuerzburg.de>

While I agree there should be a graceful way to go back to the
original head from a failed merge situation, I do not think
"committing the current HEAD" is the right model for the end
user to think about it.

Wouldn't using "checkout -f" to revert to the version you would
want to go back work as expected?