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

Re: git-union-merge proposal

From
Joey Hess <joey@kitenet.net>
Date
Jun 21, 2011, 18:41 UTC
Message-ID
<20110621184101.GA12108@gnu.kitenet.net>
In-Reply-To
<7v4o3j9izr.fsf@alter.siamese.dyndns.org>
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.

-- 
see shy jo
Previous: Junio C HamanoNext: Junio C Hamano
Message 7 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.