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