On 01 Nov 2016, at 01:10 , Brandon Allbery <allbery.b at gmail.com> wrote: > You can even configure so that becomes the default for "git pull" for that repo. > > git config --local --bool pull.rebase true > git config --local --bool rebase.autoStash true This should go into the wiki page!