| Re: [AD] switching to git, 2012 edition |
[ Thread Index |
Date Index
| More lists.liballeg.org/allegro-developers Archives
]
On Sun, 1 Jul 2012 14:32:37 +0200, Elias Pschernig <elias.pschernig@xxxxxxxxxx> wrote:
>
> This is how you synchronize changes by others:
>
> 1. cd allegro
>
> 2. git pull
I suggest git pull --rebase. The difference is, afterwards your local
commits (not yet pushed) are placed on top of the updated version of the
branch you are on. Without --rebase, the default is to merge the
updated remote branch into your local branch, making the history
unnecessarily messy.
You can make pull --rebase the default for a certain branch, or all new
branches that you create: http://mislav.uniqpath.com/2010/07/git-tips/
Peter