From: Alex Riesen <raa.lkml@gmail.com>
Date: Wed, 11 Apr 2007 07:48:01 GMT
Subject: Re: Rebase, please help
Message-ID: <81b0412b0704110048j30193650r6a7e7417a9afeaf8@mail.gmail.com>
In-Reply-To: <200704110852.00540.litvinov2004@gmail.com>

On 4/11/07, Alexander Litvinov <litvinov2004@gmail.com> wrote:
>
> What is --merge for ? Will the result be the same ?

Maybe, maybe not. It uses merge strategies instead of git-am
and has advantages over blindly applying the patches (it can
know how a change got in, and it uses resolved conflict cache).