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>

diff --git a/builtin-push.c b/builtin-push.c
index 86e1f920ff961bd37c8020b01013c65e048a6b64..f8376cffa447a796794983b56e44592be6a87b80 100644 (file)
--- a/builtin-push.c
+++ b/builtin-push.c
@@ -158,9 +158,9 @@ static int do_push(const char *repo, int flags)
 
                error("failed to push some refs to '%s'", url[i]);
                if (nonfastforward) {
-                       printf("To prevent you from losing history, non-fast-forward updates were rejected.\n"
-                              "Merge the remote changes before pushing again.\n"
-                              "See the 'non-fast forward' section of 'git push --help' for details.\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"
+                              "section of 'git push --help' for details.\n");
                }
                errs++;
        }