Re: [PATCH] git-merge: add option --no-ff
- From
- Eric Wong <normalperson@yhbt.net>
- Date
- Sep 18, 2007, 06:23 UTC
- Message-ID
- <20070918062341.GD13571@hand.yhbt.net>
- In-Reply-To
- <8c5c35580709172312w55613a1bw8cc58b200c526fab@mail.gmail.com>
Lars Hjemli <hjemli@gmail.com> wrote:
Show 5 quoted lines
> On 9/18/07, Eric Wong <normalperson@yhbt.net> wrote: > > Would automatically enabling --no-ff when it detects merging of two (or > > more) SVN branches be a good thing? > > I'd say 'git-svn merge' as a wrapper for 'git merge --no-ff' would be cleaner.
That still involves having to get the user to use something new to avoid shooting themselves in the foot. Perhaps putting a "test -d $GIT_DIR/svn" condition in front of the git-svn call I proposed in git-merge would be alright.
If anybody else is thinking about 'git-svn rebase', this is completely different. Using git-rebase alone doesn't allow git-svn users to shoot themselves in the foot like git-merge does. 'git-svn rebase' only serves to minimize typing and brain power needed to operate git-svn.
-- Eric Wong