From: Miklos Vajna <vmiklos@frugalware.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Russell King <rmk@arm.linux.org.uk>, git@vger.kernel.org
Subject: Re: git merge vs git commit
Date: Tue, 9 Sep 2008 20:54:18 +0200 [thread overview]
Message-ID: <20080909185418.GI4829@genesis.frugalware.org> (raw)
In-Reply-To: <7vhc8p6x59.fsf@gitster.siamese.dyndns.org>
[-- Attachment #1: Type: text/plain, Size: 248 bytes --]
On Tue, Sep 09, 2008 at 10:34:42AM -0700, Junio C Hamano <gitster@pobox.com> wrote:
> I think some changes went into 1.6.0 around this area to (r)eject parents
> that are redundant.
Yes, it was your 98cf9c3 (Introduce reduce_heads(), 2008-06-27).
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2008-09-09 18:54 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-09 16:52 git merge vs git commit Russell King
2008-09-09 17:34 ` Junio C Hamano
2008-09-09 18:54 ` Miklos Vajna [this message]
2008-09-09 19:11 ` Junio C Hamano
2008-09-09 21:32 ` Matthieu Moy
-- strict thread matches above, loose matches on Subject: below --
2008-09-10 17:42 Ulrik Sverdrup
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=20080909185418.GI4829@genesis.frugalware.org \
--to=vmiklos@frugalware.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=rmk@arm.linux.org.uk \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.