Code

push: spell 'Note about fast-forwards' section name correctly in error message.
authorMatthieu Moy <Matthieu.Moy@imag.fr>
Mon, 11 Jan 2010 21:09:44 +0000 (22:09 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 Jan 2010 04:34:16 +0000 (20:34 -0800)
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>
builtin-push.c

index f7661d245e6abb7be3bddee5141403c911c9ec43..28a26e7db2a86bf1514cdd54f9735c0be146dce7 100644 (file)
@@ -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;