Re: git and rebasing

[Santi Béjar <santi agolina net>]

2009/4/9 Simos <simos lists googlemail com>:
> Hi All,
>
> In my latest push to gtk+, I noticed that I had a "Merge branch
> 'master' of ssh://simos git gnome org/git/gtk+" in the commit message.
> URL is
> http://git.gnome.org/cgit/gtk+/
> http://git.gnome.org/cgit/gtk+/commit/?id=fbbbf7a936f891dfc0d7f0e4b78aeefe972d6825
>
> Obviously, this happened because I committed my change before pulling.
> I suspect that this will be quite common once the translation teams
> start using git.
> I'ld like to figure out the best way to address the issue.
>
> Shall we instruct people to always
> $ git --rebase pull
It is $ git pull --rebase
> before they
> $ git push

For me the solution is to only do commits meant for the upstream
branch, i.e. not commit things in master not meant for origin/master.

In other words, work with topic branches that are merged to master when ready.

Santi