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

Re: How to merge git://repo.or.cz/git-gui into git.git

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 30, 2007, 03:46 UTC
Message-ID
<7vmyu1s1qt.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<20071030005217.GT14735@spearce.org>
"Shawn O. Pearce" <spearce@spearce.org> writes:
Show 11 quoted lines
>> 2. pull with subtree strategy
>> ~/git-gui$  git-pull -s subtree git master:master
>
> You are merging in the wrong direction.  You want to merge git-gui
> into git.git:
>
> 	git clone git://repo.or.cz/alt-git.git mygit
> 	cd mygit
> 	git pull -s subtree git://repo.or.cz/git-gui.git master
>
> So you are pulling git-gui into git, not the reverse.

Actually, subtree strategy was designed to allow merging back and forth. But the result, as it _is_ a merge, will not omit any commit from the history from both branches.

Previous: Yin PingNext: Yin Ping
Message 9 of 10 in “How to merge git://repo.or.cz/git-gui into git.git”
  1. Yin PingOct 28, 2007
  2. Yin PingOct 28, 2007
  3. Peter BaumannOct 28, 2007
  4. Yin PingOct 28, 2007
  5. Miklos VajnaOct 28, 2007
  6. Yin PingOct 29, 2007
  7. Shawn O. PearceOct 30, 2007
  8. Yin PingOct 30, 2007
  9. Junio C HamanoOct 30, 2007
  10. Yin PingOct 30, 2007

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.