From: Lars Hjemli <hjemli@gmail.com>
Date: Mon, 17 Sep 2007 16:14:56 GMT
Subject: Re: [PATCH] git-merge: add option --no-ff
Message-ID: <8c5c35580709170914n60bf3580r963567fcaac1d2e9@mail.gmail.com>
In-Reply-To: <20070917160755.GA11287@pe.Belkin>

On 9/17/07, Chris Shoemaker <c.shoemaker@cox.net> wrote:
> On Mon, Sep 17, 2007 at 04:12:56PM +0200, Lars Hjemli wrote:
> > On 9/17/07, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> > > But then, I do not use svn branches here, and that might be the problem?
> >
> > Probably. The case I'm trying to solve is:
> >   -git-svn branch A is merged into git-svn branch B
> >   -A is a fast-forward of B
>
> Ah, now I see what you mean.  But, IIUC, if you want to dcommit your
> merge, you should treat it the way svn treats it, with git-merge
> --squash.  Then, dcommit won't be confused about the branch you're
> committing to.

Yeah, --squash is a viable option (I _almost_ used it ;-) but I wanted
to keep the merge-history on the git side (without modifying the
grafts-file).

-- 
larsh