From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 04 Mar 2013 21:18:22 GMT
Subject: Re: "git rebase" loses the additional changes in "evil" merges
Message-ID: <7vtxoqx3s1.fsf@alter.siamese.dyndns.org>
In-Reply-To: <201303042058.r24KwwEx012408@freeze.ariadne.com>

worley@alum.mit.edu (Dale R. Worley) writes:

> (git version 1.7.7.6)
>
> I've been learning how to use Git.  While exploring "git rebase", I've
> discovered that if the branch being rebased contains an "evil" merge,
> that is, a merge which contains changes that are in addition to the
> changes in any of the parent commits, the rebase operation will
> silenty lose those additional changes.

I think this is to be expected for "git rebase", as it does not even
look at merges.  It is a way to find non-merge commits that haven't
been applied yet, and apply them to the upstream to create a new
linear history.