summaryrefslogtreecommitdiff
path: root/builtin-push.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2009-09-06 02:47:20 -0400
committerJunio C Hamano <gitster@pobox.com>2009-09-06 00:39:15 -0700
commit14b772a0d7cb983ab0c13d672ea89192c460d070 (patch)
tree24632ced0d36a17a407b15fc544e16e6565bfa7c /builtin-push.c
parente1f8f0cfbef594edd12aba13df8ec53d401ce944 (diff)
downloadgit-14b772a0d7cb983ab0c13d672ea89192c460d070.tar.gz
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>
Diffstat (limited to 'builtin-push.c')
-rw-r--r--builtin-push.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin-push.c b/builtin-push.c
index 86e1f920ff..f8376cffa4 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++;
}