From: Matthieu Moy Date: Mon, 11 Jan 2010 21:09:44 +0000 (+0100) Subject: push: spell 'Note about fast-forwards' section name correctly in error message. X-Git-Tag: v1.7.0-rc0~107 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c0eb604330e1288300d915f25868d1eed88d3038;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/builtin-push.c b/builtin-push.c index f7661d245..28a26e7db 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;