[PATCH 2/4] push: re-flow non-fast-forward message
- From
Jeff King <peff@peff.net>
- Date
- Sep 6, 2009, 06:47 UTC
- Message-ID
- <20090906064720.GB28941@coredump.intra.peff.net>
- In-Reply-To
- <20090906064454.GA1643@coredump.intra.peff.net>
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> --- I am actually not all that fond of the particular wording, either, but I didn't want to re-open a wording bikeshed debate.
builtin-push.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin-push.c b/builtin-push.c index 8d72cc2..787011f 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++; }
-- 1.6.4.2.266.g981efc.dirty