Re: A simple git workflow for the rest of us

[David Engster]

Lars Magne Ingebrigtsen writes:
> David Engster <address@hidden> writes:
>
>> I strongly suggest to change the default to something like 'simple',
>> which will only update the current branch to the corresponding upstream
>> branch with the same name. This was also made the new default in Git
>> 2.x (way too late, but at least they changed it).
>>
>> You can set this globally by doing
>>
>>   git config --global push.default simple
>
> I see; thanks.  Is there a way to set this for the Emacs repository
> only, so that the simple git Emacs instructions doesn't affect what the
> developer might otherwise be working on?

Simply omit the '--global' and do it in the Emacs repo.

> Or, since the default has changed now, is this something that
> basically everybody wants, so it really should be global?

The experts who happen to like 'matching' won't read your instructions
anyway. ;-) But yes, I guess doing it local is better.

-David