Re: [PATCH] git-merge: add option --no-ff
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Sep 17, 2007, 13:23 UTC
- Message-ID
- <Pine.LNX.4.64.0709171422340.28586@racer.site>
- In-Reply-To
- <8c5c35580709170616i49a8836hb60423c5eebf601d@mail.gmail.com>
Hi,
On Mon, 17 Sep 2007, Lars Hjemli wrote:
Show 5 quoted lines
> When 'git-svn dcommit' decides which commits it should push back > subversion, it scans the output from 'git-log --first-parent HEAD' > looking for embedded 'git-svn-id' lines. These lines contain the url > of the upstream subversion repository + the subversion revision > number.
> So the problem with fast-forward merges of subversion branches is that > the output from 'git-log --first-parent HEAD' will show commits from the > wrong subversion branch (the fast-forwarded commits).
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?
Ciao, Dscho