From 452c6d506b1a6dcf24d4ceaa592afc39c1c1a60e Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Mon, 2 Aug 2010 15:42:44 +0200 Subject: 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 Signed-off-by: Junio C Hamano diff --git a/builtin/push.c b/builtin/push.c index f4358b9..69bc2f2 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; -- cgit v0.10.2-6-g49f6