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

Re: Correct way to pull using subtree merge without guesswork?

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 24, 2012, 18:27 UTC
Message-ID
<7vy5sx2byi.fsf@alter.siamese.dyndns.org>
In-Reply-To
<jfmr88$1p8$1@dough.gmane.org>
Manuel Reimer <Manuel.Spam@nurfuerspam.de> writes:
> git pull -s subtree -X subtree=path/to/subtree externalproject master
>
> Returns with success, but is "-X subtree=" the right way to force a
> subtree path and disallow git to autodetect the subtree?

More or less. Note that with the syntax, you cannot still express the distinction between mapping the root of external to path/to/subtree of your current tree and mapping the other way around, but that is not an issue in practice.

By the way, I had an impression that "-X subtree" makes "-s subtree" redundant and unnecessary.

Previous: Manuel Reimer
Message 2 of 2 in “Correct way to pull using subtree merge without guesswork?”
  1. Manuel ReimerJan 24, 2012
  2. Junio C HamanoJan 24, 2012

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.