Merge or Cherry-Pick?

Stefan Majewsky stefan.majewsky at
Tue Feb 1 21:35:39 GMT 2011

On Tue, Feb 1, 2011 at 10:22 PM, Aaron J. Seigo <aseigo at> 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).


More information about the kde-core-devel mailing list