From: "Yin Ping" <pkufranky@gmail.com>
To: git@vger.kernel.org
Subject: How to merge git://repo.or.cz/git-gui into git.git
Date: Sun, 28 Oct 2007 18:57:06 +0800 [thread overview]
Message-ID: <46dff0320710280357u23927960hd204760b3d664ce2@mail.gmail.com> (raw)
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 reply other threads:[~2007-10-28 10:57 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-28 10:57 Yin Ping [this message]
2007-10-28 11:00 ` How to merge git://repo.or.cz/git-gui into git.git Yin Ping
2007-10-28 11:14 ` Peter Baumann
2007-10-28 12:44 ` Yin Ping
2007-10-28 18:13 ` Miklos Vajna
2007-10-29 6:45 ` Yin Ping
2007-10-30 0:52 ` Shawn O. Pearce
2007-10-30 2:12 ` Yin Ping
2007-10-30 3:46 ` Junio C Hamano
2007-10-30 8:51 ` Yin Ping
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=46dff0320710280357u23927960hd204760b3d664ce2@mail.gmail.com \
--to=pkufranky@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).