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

Mike Frysinger vapier at gentoo.org
Wed May 6 13:37:43 UTC 2009


On Wednesday 06 May 2009 06:11:09 Mike Frysinger wrote:
> 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=eacb3674d0843f700cb7ddddfcd1f16b8
> >04 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.

"automatic" merges should be rejected now ... hopefully it doesnt reject valid 
merge cases

$ git push ../moo/
Counting objects: 8, done.
Delta compression using 2 threads.
Compressing objects: 100% (4/4), done.
Writing objects: 100% (5/5), 566 bytes, done.
Total 5 (delta 2), reused 0 (delta 0)
Unpacking objects: 100% (5/5), done.

Refusing to update refs/heads/master:

Looks like your commit is an automatic merge; please rebase

error: hooks/pre-receive exited with error code 1
To ../moo/
 ! [remote rejected] master -> master (pre-receive hook declined)
error: failed to push some refs to '../moo/'
-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/4c712184/attachment.pgp>


More information about the uClibc mailing list