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

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

From
Yin Ping <pkufranky@gmail.com>
Date
Oct 28, 2007, 10:57 UTC
Message-ID
<46dff0320710280357u23927960hd204760b3d664ce2@mail.gmail.com>
I'm reading code of git.

When I type gtlg --topo-order --pretty=oneline --abbrev-commit e92ea624 -p in directory git cloned from git.git, I get

e92ea62... Merge branch 'master' of git://repo.or.cz/git-gui c80d25d... git-gui: Correct 'git gui blame' in a subdirectory

diff --git a/git-gui.sh b/git-gui.sh
index 743b7d4..fa30ccc 100755
--- a/git-gui.sh
+++ b/git-gui.sh
...

git-gui.sh is in the git-gui directory but we see a/git-gui.sh here
other than a/git-gui/git-gui.sh.
And in git://repo.or.cz/git-gui, I see git-gui.sh in the top directory

I just wonder how does this happen and how to merge
git://repo.or.cz/git-gui into git.git this way?
-- 
franky
Next: Yin Ping
Message 1 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.