From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Jun 2011 20:19:28 GMT
Subject: Re: git-union-merge proposal
Message-ID: <7vaadb6ipb.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20110621184101.GA12108@gnu.kitenet.net>

Joey Hess <joey@kitenet.net> writes:

> Junio C Hamano wrote:
>> In other words, I would prefer to see something like:
>> 
>> 	$ git merge --index-only [-s <strategy>] <other_branch>
>
> Would this allow merging changes into a branch other than HEAD? If so, I
> agree, I'd prefer to see it in git-merge itself if possible.

I just said "I would prefer to see", so allowing or not allowing is up to
you ;-).  If course I would prefer to see it not touch HEAD so that your
working envirnoment (checked out branch and the working tree) are not
disrupted.  See my other message in the thread.