Merge or Cherry-Pick?

[Kevin Ottens]

On Tuesday 1 February 2011 23: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.

Switched to it recently, and it definitely fits my workflow better. Now I 
don't have to worry all the time with "did I rebase before my push?".

Only downside is that it applies only to newly created branches, but that's 
easy enough to fix.

Regards.
-- 
Kévin Ottens, http://ervin.ipsquad.net

KDAB - proud patron of KDE, http://www.kdab.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part.
URL: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20110202/f34dcc7b/attachment.sig>