Hilco Wijbenga <hilco.wijbe...@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/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
