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

[Tarek Soliman]

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.
So edit .git/config
or the same command as above without the --global arg
-- 
Tarek