push: mention "git pull" in error message for non-fast forwards
authorMatthieu Moy <Matthieu.Moy@imag.fr>
Mon, 2 Aug 2010 13:42:44 +0000 (15:42 +0200)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 Aug 2010 01:06:07 +0000 (18:06 -0700)
commit452c6d506b1a6dcf24d4ceaa592afc39c1c1a60e
tree32c051aaff0dc6dcaac0a68c8610fa5938eef4e3
parent987460611ab08ebac83ead9a5ee316d3b3823e7f
push: mention "git pull" in error message for non-fast forwards

The message remains fuzzy to include "git pull", "git pull --rebase" and
others, but directs the user to the simplest solution in the vast
majority of cases.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/push.c