From: "Yin Ping" <pkufranky@gmail.com>
To: "Junio C Hamano" <gitster@pobox.com>
Cc: "Shawn O. Pearce" <spearce@spearce.org>,
"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: Tue, 30 Oct 2007 16:51:45 +0800 [thread overview]
Message-ID: <46dff0320710300151k56cdf8a9o77e163e3167e73e@mail.gmail.com> (raw)
In-Reply-To: <7vmyu1s1qt.fsf@gitster.siamese.dyndns.org>
>
> Actually, subtree strategy was designed to allow merging back
> and forth. But the result, as it _is_ a merge, will not omit
> any commit from the history from both branches.
>
>
Can git-log be more clever so that it can recognize a subtree merge
and show only logs related to the subtree?
Another suggestion is that the commit msg for subtree merge should be
more accurate such as " Merge branch master of <repos> into direcotry
<dir> of branch <branch>"
--
franky
prev parent reply other threads:[~2007-10-30 8:52 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
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 [this message]
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=46dff0320710300151k56cdf8a9o77e163e3167e73e@mail.gmail.com \
--to=pkufranky@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=spearce@spearce.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).