push: re-flow non-fast-forward message

The extreme raggedness of the right edge make this jarring
to read. Let's re-flow the text to fill the lines in a more
even way.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2009-09-06 02:47:20 -04:00 committed by Junio C Hamano
parent e1f8f0cfbe
commit 14b772a0d7

View File

@ -158,9 +158,9 @@ static int do_push(const char *repo, int flags)
error("failed to push some refs to '%s'", url[i]); error("failed to push some refs to '%s'", url[i]);
if (nonfastforward) { if (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.\n" "Merge the remote changes before pushing again. See the 'non-fast forward'\n"
"See the 'non-fast forward' section of 'git push --help' for details.\n"); "section of 'git push --help' for details.\n");
} }
errs++; errs++;
} }