diff options
| author |  Matthieu Moy <Matthieu.Moy@imag.fr> | 2010-08-02 15:42:44 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-08-12 18:06:07 -0700 |
| commit | 452c6d506b1a6dcf24d4ceaa592afc39c1c1a60e (patch) | |
| tree | 32c051aaff0dc6dcaac0a68c8610fa5938eef4e3 | |
| parent | Standardize do { ... } while (0) style (diff) | |
| download | tgif-452c6d506b1a6dcf24d4ceaa592afc39c1c1a60e.tar.xz | |
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>
| -rw-r--r-- | builtin/push.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/push.c b/builtin/push.c index f4358b9d23..69bc2f27ac 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; |