Merge or Cherry-Pick?

[Aaron J. Seigo]

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.

we _really_ need to start a page to collect all these tidbits together. i'm 
not sure where yet and i'm afraid i've run out of time for today. an etherpad 
that we can all edit might be a good place to start collecting these gems, and 
then we can grab the best bits and put them on a page on techbase...

-- 
Aaron J. Seigo
humru othro a kohnu se
GPG Fingerprint: 8B8B 2209 0C6F 7C47 B1EA  EE75 D6B7 2EB1 A7F1 DB43

KDE core developer sponsored by Qt Development Frameworks
-------------- 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/20110201/d13a1dd4/attachment.sig>