Remember to rebase (was: Re: [PATCH] sh: Add PIC implementation for crt1.S)

[Mike Frysinger]

On Tuesday 05 May 2009 14:29:09 Austin Foxley wrote:
> Carmelo AMOROSO wrote:
> > Applied to git (master/nptl).
>
> Just a friendly reminder to rebase before pushing if you can. Otherwise
> we will end up with a lot of 'Merge' commits that clutter up the history
> like:
> http://git.uclibc.org/uClibc/commit/?id=eacb3674d0843f700cb7ddddfcd1f16b804
>53ac7
>
> As mentioned in the svn->git transition thread:
> http://lists.uclibc.org/pipermail/uclibc/2009-April/042416.html

i'm thinking we should reject merge commits where said commit is a merge of 
the same branch.  in other words, i'm ok with merge commits where we're 
actually doing a merge (say merging some random branch back into master), but 
a merge commit where your local repo is simply behind a commit or two doesnt 
make sense.
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.busybox.net/pipermail/uclibc/attachments/20090506/5605d232/attachment-0001.pgp>