Re: [PATCH] git-merge: add option --no-ff

From: Chris Shoemaker <c.shoemaker@cox.net>
Date: Sep 17, 2007, 16:07 UTC
Message-ID: <20070917160755.GA11287@pe.Belkin>
In-Reply-To: <8c5c35580709170712v2f5df7b1w8fa0377b69f24988@mail.gmail.com>

On Mon, Sep 17, 2007 at 04:12:56PM +0200, Lars Hjemli wrote:

Show 6 quoted lines

> 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.

-chris

Show 19 quoted lines

> 
> This might look unrealistic, but it happened to me today when I wanted
> to merge a feature-branch into a relase-branch. The release-branch had
> previously been merged into the feature-branch (to get a few
> bugfixes), but the release-branch had not changed since this merge. So
> when merging the feature-branch into the release-branch it just
> fast-forwarded, leaving me with an 'un-dcomittable' release-branch. I
> obviously could have done the merge in subversion (haha!), but doing
> it in git preserves the correct history.
> 
> Btw: I have redone the merge with --no-ff, and dcommit then worked
> like a charm ;-)
> 
> -- 
> larsh
> -
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html