Re: [orion-dev] git rebase by default

[John Arthorne <John_Arthorne@xxxxxxxxxx>]

Kris De Volder wrote on 02/14/2012 01:23:42 PM:
> > By default in Git this is rebase, which I don't think we should
> globally change. 
> 
> I'm guessing that was a typo... and you meant to say the default in
> git is *merge*. 

Yes, typo. Default on pull is to perform a merge,
unless configuration property is set of the form: branch.<branchname>.rebase=true

> I just wanted to make sure you spent some thought on the 'naive' 
> users who may get themselves (and others they work with) into 
> trouble with bad use of rebase.

Well as I said the 'naive' user case is also very
important so I'm glad you brought it up.

John