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
Yin Ping <pkufranky@gmail.com>
Date
Oct 28, 2007, 12:44 UTC
Message-ID
<46dff0320710280544r7f99ddf7xfd5aa7cefb39a9fe@mail.gmail.com>
In-Reply-To
<20071028111443.GA29183@xp.machine.xx>
On 10/28/07, Peter Baumann <waste.manager@gmx.de> wrote:
Show 8 quoted lines
> Have a look at the subtree merge strategy [1] and at the following
> explanations how git-gui got initally merged.
>
> -Peter
>
> [1]: http://www.gelato.unsw.edu.au/archives/git/0702/40139.html
> [2]: http://www.gelato.unsw.edu.au/archives/git/0702/39661.html
>

3x. I have seen that subtree stategy is introduced in commit 68fa. However, I don't find any description in manual of git-merge. Should this be added to this manual or any other document?

-- 
franky
Previous: Peter BaumannNext: Miklos Vajna
Message 4 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.