From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 30 Nov 2006 10:32:03 GMT
Subject: Re: [PATCH] git-merge: preserve and merge local changes when doing fast forward
Message-ID: <Pine.LNX.4.63.0611301129410.30004@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <7v1wnlmyba.fsf@assigned-by-dhcp.cox.net>

Hi,

On Wed, 29 Nov 2006, Junio C Hamano wrote:

> Perhaps we would want a new option to git-merge to allow preserving the 
> local changes, but the obvious candidate -m is taken for something else 
> per recent popular request X-<...

How about "-k|--keep-changes" or "-l|--local-changes", or 
"-p|--preserve-changes"?

BTW from a user's perspective, this operation _is_ a merge, not a 
checkout. So, IMHO the compatibility with that rarely used option of 
git-checkout is neglectable.

Ciao,