Thanks, that's interesting, didn't know that :)On 05/11/13 21:31, Nicolas Bock wrote:see the git push manual -> "NOTE ABOUT FAST-FORWARDS". Most common
> I have seen the same, but I don't understand what is going on. Why
> doesn't a pull on gentoo update anything?
situation is that someone pushed something and ammended that commit and
pushed again.
> <mailto:jlec@gentoo.org>> wrote:> <http://git@git.overlays.gentoo.org/proj/sci.git>
>
> Hi all.
>
> I continuously see things like
>
> $ git ph
> Pushing to git@github.com:gentoo-science/sci.git
> To git@github.com:gentoo-science/sci.git
> ! [rejected] master -> master (non-fast-forward)
> error: failed to push some refs to
> 'git@github.com:gentoo-science/sci.git'
> hint: Updates were rejected because the tip of your current branch
> is behind
> hint: its remote counterpart. Integrate the remote changes (e.g.
> hint: 'git pull ...') before pushing again.
> hint: See the 'Note about fast-forwards' in 'git push --help' for
> details.
> Pushing to git+ssh://git@git.overlays.gentoo.org/proj/sci.git
> To git+ssh://git@git.overlays.gentoo.org/proj/sci.git
> <http://git@git.overlays.gentoo.org/proj/sci.git>
> = [up to date] master -> master> <http://gitweb.overlays.gentoo.org> to a
> updating local tracking ref 'refs/remotes/origin/master'
> Everything up-to-date
>
> but a git pull doesn't bring anything new. This comes from problems with
> fast-forwarding.
>
> This is my suggestion here,
>
> We will restrict the push access in gitweb.overlays.gentoo.org
> small group of people (one, two, three official sci team devs) and move
> all other contributions over to github. This small team is then
> responsible for the merge and shouldn't screw it up.
>
> What do you think?
>
> Justin
>
>