diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2010-01-11 21:09:44 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-12 04:34:16 (GMT) |
| commit | c0eb604330e1288300d915f25868d1eed88d3038 (patch) | |
| tree | a2876728b8636b35677895016dff4f6f0e328908 | |
| parent | 637afcf4e07616d1dd15d33f56c6b72f90f39821 (diff) | |
| download | git-c0eb604330e1288300d915f25868d1eed88d3038.zip git-c0eb604330e1288300d915f25868d1eed88d3038.tar.gz git-c0eb604330e1288300d915f25868d1eed88d3038.tar.bz2 | |
push: spell 'Note about fast-forwards' section name correctly in error message.
The error message in case of non-fast forward points to 'git push
--help', but used to talk about a section 'non-fast-forward', while the
actual section name is 'Note about fast-forwards'.
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 f7661d2..28a26e7 100644 --- a/builtin-push.c +++ b/builtin-push.c @@ -125,8 +125,8 @@ static int push_with_options(struct transport *transport, int flags) if (nonfastforward && advice_push_nonfastforward) { printf("To prevent you from losing history, non-fast-forward updates were rejected\n" - "Merge the remote changes before pushing again. See the 'non-fast-forward'\n" - "section of 'git push --help' for details.\n"); + "Merge the remote changes before pushing again. See the 'Note about\n" + "fast-forwards' section of 'git push --help' for details.\n"); } return 1; |