Skip to content

Commit

Permalink
push: re-flow non-fast-forward message
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
peff authored and gitster committed Sep 6, 2009
1 parent e1f8f0c commit 14b772a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions builtin-push.c
Original file line number Diff line number Diff line change
Expand Up @@ -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++;
}
Expand Down

0 comments on commit 14b772a

Please sign in to comment.