[Scummvm-devel] On using git correctly: Rebase vs. merge

[Marcus Comstedt]

Tarek Soliman <tarek-spam at zeusmail.bounceme.net> writes:

> On Wed, Feb 16, 2011 at 04:56:59PM +0100, Marcus Comstedt wrote:
>> 
>> this configuration automatically.  If you put
>> 
>> [branch]
>>         autosetuprebase = remote
>> 
>> in your .gitconfig (for example by running "git config --global
>> branch.autosetuprebase remote"), then any newly created branch will
>
> I would say put it in your local repo instead of globally. Unless you want this behavior for all git activity on this machine.

--global does not make it global for the machine, it only sets it for
the user.  To set it for all users on the machine, you have to use
--system.

Setting the config in the repository misses the main use case, namely
that you'll want the rebase flag for the initially created branch you
get when you clone.


  // Marcus