X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin%2Fpush.c;h=69bc2f27ac414ce3532f6babcc68671b0b95d65a;hb=16bfbe6352e90b87de26effe5ce120ab74ebafc7;hp=f4358b9d230f6d8d7a9a67fdfbc60279c5ec71ee;hpb=ea5f75a64ae52590b06713d45d84de03ca109ccc;p=git.git

diff --git a/builtin/push.c b/builtin/push.c
index f4358b9d2..69bc2f27a 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;