git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Miklos Vajna <vmiklos@frugalware.org>
To: Yin Ping <pkufranky@gmail.com>
Cc: Peter Baumann <waste.manager@gmx.de>, git@vger.kernel.org
Subject: Re: How to merge git://repo.or.cz/git-gui into git.git
Date: Sun, 28 Oct 2007 19:13:05 +0100	[thread overview]
Message-ID: <20071028181305.GL23810@genesis.frugalware.org> (raw)
In-Reply-To: <46dff0320710280544r7f99ddf7xfd5aa7cefb39a9fe@mail.gmail.com>

[-- Attachment #1: Type: text/plain, Size: 335 bytes --]

On Sun, Oct 28, 2007 at 08:44:44PM +0800, Yin Ping <pkufranky@gmail.com> wrote:
> 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?

i think the git-merge manpage should mention it.

- VMiklos

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

  reply	other threads:[~2007-10-28 18:13 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
2007-10-28 18:13       ` Miklos Vajna [this message]
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=20071028181305.GL23810@genesis.frugalware.org \
    --to=vmiklos@frugalware.org \
    --cc=git@vger.kernel.org \
    --cc=pkufranky@gmail.com \
    --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).