X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin%2Fpush.c;h=e655eb7695faba13c4d9e8f25b9649ffec7195be;hb=ebb561bcfc7f04b3122150821dde7aca0356f00c;hp=a2cc9fdea1b22739681c26ee3723058c91018d81;hpb=730901ab00a87a57b99d6ceca78a2acdb10636e8;p=git.git

diff --git a/builtin/push.c b/builtin/push.c
index a2cc9fdea..e655eb769 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -130,8 +130,8 @@ static int push_with_options(struct transport *transport, int flags)
 
 	if (nonfastforward && advice_push_nonfastforward) {
 		fprintf(stderr, "To prevent you from losing history, non-fast-forward updates were rejected\n"
-				"Merge the remote changes before pushing again.  See the 'Note about\n"
-				"fast-forwards' section of 'git push --help' for details.\n");
+				"Merge the remote changes (e.g. 'git pull') before pushing again.  See the\n"
+				"'Note about fast-forwards' section of 'git push --help' for details.\n");
 	}
 
 	return 1;