summaryrefslogtreecommitdiff
path: root/builtin/push.c
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2010-08-02 13:42:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-13 01:06:07 (GMT)
commit452c6d506b1a6dcf24d4ceaa592afc39c1c1a60e (patch)
tree32c051aaff0dc6dcaac0a68c8610fa5938eef4e3 /builtin/push.c
parent987460611ab08ebac83ead9a5ee316d3b3823e7f (diff)
downloadgit-452c6d506b1a6dcf24d4ceaa592afc39c1c1a60e.zip
git-452c6d506b1a6dcf24d4ceaa592afc39c1c1a60e.tar.gz
git-452c6d506b1a6dcf24d4ceaa592afc39c1c1a60e.tar.bz2
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>
Diffstat (limited to 'builtin/push.c')
-rw-r--r--builtin/push.c4
1 files changed, 2 insertions, 2 deletions
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;