From e1f8f0cfbef594edd12aba13df8ec53d401ce944 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Sun, 6 Sep 2009 02:46:25 -0400 Subject: push: fix english in non-fast-forward message We must use an article when referring to the section because it is a non-proper noun, and it must be the definite article because we are referring to a specific section. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano diff --git a/builtin-push.c b/builtin-push.c index 50328f4..86e1f92 100644 --- a/builtin-push.c +++ b/builtin-push.c @@ -160,7 +160,7 @@ static int do_push(const char *repo, int flags) 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 'non-fast forward' section of 'git push --help' for details.\n"); + "See the 'non-fast forward' section of 'git push --help' for details.\n"); } errs++; } -- cgit v0.10.2-6-g49f6 From 14b772a0d7cb983ab0c13d672ea89192c460d070 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Sun, 6 Sep 2009 02:47:20 -0400 Subject: 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 86e1f92..f8376cf 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++; } -- cgit v0.10.2-6-g49f6