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 30, 2007, 08:51 UTC
Message-ID
<46dff0320710300151k56cdf8a9o77e163e3167e73e@mail.gmail.com>
In-Reply-To
<7vmyu1s1qt.fsf@gitster.siamese.dyndns.org>
Show 6 quoted lines
>
> 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.
>
>

Can git-log be more clever so that it can recognize a subtree merge and show only logs related to the subtree?

Another suggestion is that the commit msg for subtree merge should be more accurate such as " Merge branch master of <repos> into direcotry <dir> of branch <branch>"

-- 
franky
Previous: Junio C Hamano
Message 10 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.