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

[Marcus Comstedt]

Max Horn <max at quendi.de> writes:

[...]
> It is even possible to tell git to use "--rebase" on "git pull" by default -- globally, or just for a specific repository. To get this, run "git config branch.master.rebase true" while inside your clone of the scummvm git repository.


I'll just add here that there is a very useful setting which can make
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
have the rebase setting set to true iff it is tracking a remote
branch.  This is almost always what you want (and you can of course
still override the setting once the branch is created).


  // Marcus