Re: wip push- rebase first

[Jonathan Perkin <jperkin%joyent.com@localhost>]

* On 2015-10-10 at 00:27 BST, Rhialto wrote:

> On Wed 07 Oct 2015 at 08:21:32 -0400, Greg Troxel wrote:
> >   don't create (or rebase out) unnecessary merge commits (such as the
> >   ones created by git pull)
> 
> For that a short reference to a configuration setting to make rebases
> default is useful: pull.rebase or branch.<name>.rebase as documented
> further in git-config(1).

For as long as this thread has been going the page in question has
documented 'git pull -r' as the way to pull changes from upstream, and
does exactly this.

Perhaps if the long option equivalent '--rebase' had been used in the
first place we could have avoided this thread completely.

-- 
Jonathan Perkin  -  Joyent, Inc.  -  www.joyent.com