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>
Matthieu Moy committed
Aug 2, 2010 at 15:42 UTC
452c6d506b1a6dcf24d4ceaa592afc39c1c1a60e
1 file changed
+2
-2
builtin/push.c
+2
-2
@@ -130,8 +130,8 @@ static int push_with_options(struct transport *transport, int flags)
130
131
if (nonfastforward && advice_push_nonfastforward) {
132
fprintf(stderr, "To prevent you from losing history, non-fast-forward updates were rejected\n"
133
- "Merge the remote changes before pushing again. See the 'Note about\n"
134
- "fast-forwards' section of 'git push --help' for details.\n");
133
+ "Merge the remote changes (e.g. 'git pull') before pushing again. See the\n"
134
+ "'Note about fast-forwards' section of 'git push --help' for details.\n");
135
}
136
137
return 1;