From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Mon, 09 Jul 2012 08:36:55 GMT
Subject: Re: On using receive.denyNonFastForwards and advice.pushNonFastForward
Message-ID: <vpqobnpz5y0.fsf@bauges.imag.fr>
In-Reply-To: <CAE1pOi1M-fdMJtZw9MNL2R6zWvpXvWVo4ros_NSCQtLmQb6TOQ@mail.gmail.com>

Hilco Wijbenga <hilco.wijbenga@gmail.com> writes:

> I was wondering how hard it would be to make "git push" more adamant
> about not pushing non-ff updates. So I wanted to see the effects of
> receive.denyNonFastForwards

This changes the behavior only if you use --force (or some magic refspec
starting with +). If you never used --force or +refspecs, you never did
a non-fast-forward push.

> and advice.pushNonFastForward.

Activated by default, so if you never did anything about it, it was
already active.

> Apparently, linear history and FF-only updates are not the same thing?

No, they are not. non-FF means you're trying to push a commit which is
not a direct descendant of the remote one, i.e. you're trying to
override the remote history with yours. See 'NOTE ABOUT FAST-FORWARDS'
in "man git-push".

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/