From: Johannes Sixt <j.sixt@viscovery.net>
Date: Wed, 28 Nov 2012 06:56:25 GMT
Subject: Re: [PATCH v2 3/3] Add option to transpose parents of merge commit
Message-ID: <50B5B599.3020105@viscovery.net>
In-Reply-To: <1354057217-65886-4-git-send-email-draenog@pld-linux.org>

Am 11/28/2012 0:00, schrieb Kacper Kornet:
> When the changes are pushed upstream, and in the meantime someone else
> updated upstream branch git advises to use git pull. This results in
> history:
> 
>      ---A---B---C--
>          \     /
>           D---E

The commit message will say:

  Merge branch 'master' of /that/remote

  * 'master' of /that/remote:
    E
    D

> where B is the local commit. D, E are commits pushed by someone else
> when the developer was working on B. However sometimes the following
> history is preferable:
> 
>     ---A---D---C'--
>         \     /
>          '-B-'

Better:

     ---A--D--E--C'
         \      /
          `----B

In this case, the commit message should say... what? Certainly not the
same thing. But I do not see that you changed anything in this regard.

-- Hannes