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

[Jan Hudec]

On Mon, Nov 20, 2006 at 09:59:19AM +0100, Erik B?gfors wrote:
> 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.

If it was up to me, I'd prefer merge always doing pull if it can,
uncoditionally. Because I can't imagine any case where I would not want
that. Yes, there go revision numbers, but I actually consider them
superfluous anyway -- they are not unique nor stable in all cases, so
for me they make no difference whether they exist.

I understand that other people may see uses for making trivial merges,
which is why I did it as an option. I did the --trivial option, so users
are encouraged to make a decision which way they want it. But I can make
the current behaviour the default if others think it's better.

--------------------------------------------------------------------------------
                  				- Jan Hudec `Bulb' <bulb at ucw.cz>