Skip to content

Commit

Permalink
push: spell 'Note about fast-forwards' section name correctly in erro…
Browse files Browse the repository at this point in the history
…r 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>
  • Loading branch information
Matthieu Moy authored and Junio C Hamano committed Jan 12, 2010
1 parent 637afcf commit c0eb604
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions builtin-push.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit c0eb604

Please sign in to comment.