From: Miklos Vajna Date: Tue, 09 Sep 2008 18:54:18 GMT Subject: Re: git merge vs git commit Message-ID: <20080909185418.GI4829@genesis.frugalware.org> In-Reply-To: <7vhc8p6x59.fsf@gitster.siamese.dyndns.org> On Tue, Sep 09, 2008 at 10:34:42AM -0700, Junio C Hamano 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).