From: "Yin Ping" <pkufranky@gmail.com>
To: "Peter Baumann" <waste.manager@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: How to merge git://repo.or.cz/git-gui into git.git
Date: Sun, 28 Oct 2007 20:44:44 +0800 [thread overview]
Message-ID: <46dff0320710280544r7f99ddf7xfd5aa7cefb39a9fe@mail.gmail.com> (raw)
In-Reply-To: <20071028111443.GA29183@xp.machine.xx>
On 10/28/07, Peter Baumann <waste.manager@gmx.de> wrote:
> 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
next prev parent reply other threads:[~2007-10-28 12:45 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-28 10:57 How to merge git://repo.or.cz/git-gui into git.git Yin Ping
2007-10-28 11:00 ` Yin Ping
2007-10-28 11:14 ` Peter Baumann
2007-10-28 12:44 ` Yin Ping [this message]
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=46dff0320710280544r7f99ddf7xfd5aa7cefb39a9fe@mail.gmail.com \
--to=pkufranky@gmail.com \
--cc=git@vger.kernel.org \
--cc=waste.manager@gmx.de \
/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).