Merge or Cherry-Pick?

[Andreas Pakulat]

On 01.02.11 14:06:47, Aaron J. Seigo wrote:
> On Tuesday, February 1, 2011, Stefan Majewsky wrote:
> > On Tue, Feb 1, 2011 at 10:22 PM, Aaron J. Seigo <aseigo at kde.org> wrote:
> > > then i learned today to be extra vigilant about doing `git pull --rebase`
> > > and not just `git pull` so i don't accidentally throw merge commits in
> > > there while preping for a push.
> > 
> > Look in man git-config for "branch.autosetuprebase". I think this
> > should go into the Git manual after someone has checked this (did not
> > actually try it).
> 
> ooh, very cool. ok, i'm going to try running with this and see how it rolls.

In addition to that you probably also want to do git config
branch.yourbranchname.rebase true for any branches you already created
locally (thats what autosetuprebase does when creating a new local
branch from a remote one)

We're using that since 1+ year at work now and so far haven't had a
single case where it broke something.

Andreas

-- 
You love peace.