kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Matthieu Moy 2010-01-11 22:09:44 +01:00 committed by Junio C Hamano
parent 637afcf4e0
commit c0eb604330
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin-push.c
View File

@ -125,8 +125,8 @@ static int push_with_options(struct transport *transport, int flags)


if (nonfastforward && advice_push_nonfastforward) { if (nonfastforward && advice_push_nonfastforward) {
printf("To prevent you from losing history, non-fast-forward updates were rejected\n" 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" "Merge the remote changes before pushing again. See the 'Note about\n"
"section of 'git push --help' for details.\n"); "fast-forwards' section of 'git push --help' for details.\n");
} }


return 1; return 1;