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

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Matthew D. Fuller 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).
> 
> 

I agree, +1 on adding --pull, but I prefer leaving trivial the default,
and with automatic boolean option negations, it just becomes --no-pull.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFFYc5OJdeBCYSNAAMRAslsAKC46Jv0CULK86ArWLUYdUJY72cZFACgwCUW
jjlC2tsHMYm0L/DFXN9gr0w=
=ARiu
-----END PGP SIGNATURE-----