git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git-union-merge proposal

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 21, 2011, 20:19 UTC
Message-ID
<7vaadb6ipb.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20110621184101.GA12108@gnu.kitenet.net>
Joey Hess <joey@kitenet.net> writes:
Show 7 quoted lines
> 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.

Previous: Joey Hess
Message 8 of 8 in “git-union-merge proposal”
  1. Joey HessJun 21, 2011
  2. Jonathan NiederJun 21, 2011
  3. Johan HerlandJun 21, 2011
  4. Joey HessJun 21, 2011
  5. Junio C HamanoJun 21, 2011
  6. Junio C HamanoJun 21, 2011
  7. Joey HessJun 21, 2011
  8. Junio C HamanoJun 21, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.