From: Jeff King Date: Sun, 6 Sep 2009 06:47:20 +0000 (-0400) Subject: push: re-flow non-fast-forward message X-Git-Tag: v1.6.5-rc0~1^2~2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=14b772a0d7cb983ab0c13d672ea89192c460d070;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/builtin-push.c b/builtin-push.c index 86e1f920f..f8376cffa 100644 --- 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++; }