Merge or Cherry-Pick?

[Stefan Majewsky]

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).

Greetings
Stefan