[RFC][PATCH] New options to choose fast-forwarding on merge.

[Erik Bågfors]

On 11/20/06, Matthew D. Fuller <fullermd at over-yonder.net> wrote:
> On Sun, Nov 19, 2006 at 10:03:35AM +0100 I heard the voice of
> Jan Hudec, and lo! it spake thus:
> >
> > I have implemented two options for the merge command, --pull and
> > --trivial,
>
> For whatever my numbers may be worth, I'm +1 on adding this
> capability, but -1 on having it do neither by default (and -0.5 or so
> on fast-forward by default).

Since a pull rewrites history in a sense, I'm -1 on having it be the
default.  I'm also -1 on doing neither by default.

I would let trivial be default, remove the option --trivial (since
it's available with --no-pull for anyone overwriting it in an alias),
and make sure that there is a way to set this per branch.

/Erik

-- 
google talk/jabber. zindar at gmail.com
SIP-phones: sip:erik_bagfors at gizmoproject.com
sip:17476714687 at proxy01.sipphone.com