Code

push: point to 'git pull' and 'git push --force' in case of non-fast forward
authorMatthieu Moy <Matthieu.Moy@imag.fr>
Sat, 8 Aug 2009 07:51:08 +0000 (09:51 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 12 Aug 2009 23:15:47 +0000 (16:15 -0700)
commit07436e43daf1a97d3d702090d6289f745bd5ad90
treee8f0cbf00412a6028e5b1f12a8f9f55383bfc1d2
parente89df7dcda9836518a68cce27231625f90d94749
push: point to 'git pull' and 'git push --force' in case of non-fast forward

'git push' failing because of non-fast forward is a very common situation,
and a beginner does not necessarily understand "fast forward" immediately.

Add a new section to the git-push documentation and refer them to it.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-push.txt
builtin-push.c
transport.c
transport.h