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

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sep 17, 2007, 13:57 UTC
Message-ID: <Pine.LNX.4.64.0709171454031.28586@racer.site>
In-Reply-To: <8c5c35580709170638mc0c8279pa86d71bd79fd3084@mail.gmail.com>

Hi,

On Mon, 17 Sep 2007, Lars Hjemli wrote:

Show 13 quoted lines

> [Cc'd Eric since he's the expert on git-svn]
> 
> On 9/17/07, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
>
> > Ah, I think I know what you're trying to get at.  But "git svn fetch 
> > && git rebase git-svn" might be a better approach than "git svn fetch 
> > && git merge --no-ff git-svn", no?
> 
> If I'm understanding you right: no. After a rebase, the commits would be 
> ignored by git-svn when looking for the subversion upstream branch 
> (since the commit SHA1's would no longer match the ones stored in 
> git-svn's rev_db), but the subversion history would look like 
> 'cherry-picked n commits from merged branch' after dcommit.

I feel that I am not really qualified here, since I am a strict git-svn _user_, but AFAICT it worked here all the time, _especially_ with fast forwards. The trick is that all commits that were added after the branch point do _not_ contain any svn lines.

But then, I do not use svn branches here, and that might be the problem?

Ciao, Dscho