@matheusbsbs / matheus-bagliano / commits / c0eb604330
Fork 0

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>

Matthieu Moy committed Jan 11, 2010 at 22:09 UTC c0eb604330e1288300d915f25868d1eed88d3038
1 file changed +2 -2
builtin-push.c
+2 -2
@@ -125,8 +125,8 @@ static int push_with_options(struct transport *transport, int flags)
125
126 if (nonfastforward && advice_push_nonfastforward) {
127 printf("To prevent you from losing history, non-fast-forward updates were rejected\n"
128 - "Merge the remote changes before pushing again. See the 'non-fast-forward'\n"
129 - "section of 'git push --help' for details.\n");
128 + "Merge the remote changes before pushing again. See the 'Note about\n"
129 + "fast-forwards' section of 'git push --help' for details.\n");
130 }
131
132 return 1;