Home » Mailing list archives » git » 2009 » September » 6

[PATCH 2/4] push: re-flow non-fast-forward message

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Jeff King
Subject: [PATCH 2/4] push: re-flow non-fast-forward message
Date: Saturday, September 5, 2009 - 11:47 pm

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

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH] push: point to 'git pull' and 'git push --force' i ..., Matthieu Moy, (Thu Aug 6, 10:32 am)
Re: [PATCH] push: point to 'git pull' and 'git push --forc ..., Michael J Gruber, (Thu Aug 6, 1:04 pm)
Re: [PATCH] push: point to 'git pull' and 'git push --forc ..., Junio C Hamano, (Thu Aug 6, 1:15 pm)
[PATCH] Re: push: point to 'git pull' and 'git push --forc ..., Nicolas Sebrecht, (Thu Aug 6, 2:16 pm)
Re: [PATCH] Re: push: point to 'git pull' and 'git push -- ..., Junio C Hamano, (Thu Aug 6, 2:32 pm)
Re: [PATCH] push: point to 'git pull' and 'git push --forc ..., Matthieu Moy, (Fri Aug 7, 12:21 pm)
Re: [PATCH] push: point to 'git pull' and 'git push --forc ..., Matthieu Moy, (Fri Aug 7, 12:37 pm)
Re: [PATCH] push: point to 'git pull' and 'git push --forc ..., Michael J Gruber, (Fri Aug 7, 12:46 pm)
Re: [PATCH] push: point to 'git pull' and 'git push --forc ..., Junio C Hamano, (Fri Aug 7, 1:05 pm)
Re: [PATCH] push: point to 'git pull' and 'git push --forc ..., Matthieu Moy, (Fri Aug 7, 1:22 pm)
[PATCH v2] push: point to 'git pull' and 'git push --force ..., Matthieu Moy, (Sat Aug 8, 12:51 am)
Re: [PATCH v2] push: point to 'git pull' and 'git push --f ..., Teemu Likonen, (Sat Aug 8, 1:35 am)
Re: [PATCH v2] push: point to 'git pull' and 'git push --f ..., Matthieu Moy, (Sat Aug 8, 8:22 am)
Re: [PATCH v2] push: point to 'git pull' and 'git push --f ..., Junio C Hamano, (Sat Aug 8, 9:25 am)
[PATCH v2] Re: push: point to 'git pull' and 'git push --f ..., Nicolas Sebrecht, (Sat Aug 8, 3:23 pm)
Re: [PATCH v2] push: point to 'git pull' and 'git push --f ..., Matthieu Moy, (Sun Aug 9, 11:35 am)
Re: [PATCH v2] push: point to 'git pull' and 'git push --f ..., Junio C Hamano, (Sun Aug 9, 1:22 pm)
Re: [PATCH v2] push: point to 'git pull' and 'git push --f ..., Matthieu Moy, (Mon Aug 10, 1:43 am)
Re: [PATCH v2] push: point to 'git pull' and 'git push --f ..., Junio C Hamano, (Mon Aug 10, 1:49 am)
Re: [PATCH v2] push: point to 'git pull' and 'git push --f ..., Matthieu Moy, (Mon Aug 10, 1:56 am)
Re: [PATCH v2] push: point to 'git pull' and 'git push --f ..., Nanako Shiraishi, (Mon Aug 10, 8:03 pm)
[RFC/PATCH 0/4] make helpful messages optional, Jeff King, (Sat Sep 5, 11:44 pm)
[PATCH 1/4] push: fix english in non-fast-forward message, Jeff King, (Sat Sep 5, 11:46 pm)
[PATCH 2/4] push: re-flow non-fast-forward message, Jeff King, (Sat Sep 5, 11:47 pm)
[PATCH 3/4] push: make non-fast-forward help message confi ..., Jeff King, (Sat Sep 5, 11:48 pm)
[PATCH 4/4] status: make &quot;how to stage&quot; messages optional, Jeff King, (Sat Sep 5, 11:50 pm)
Re: [PATCH 3/4] push: make non-fast-forward help message c ..., Junio C Hamano, (Sun Sep 6, 12:09 am)
Re: [PATCH 3/4] push: make non-fast-forward help message c ..., Jeff King, (Sun Sep 6, 12:23 am)
Re: [PATCH 3/4] push: make non-fast-forward help message c ..., Junio C Hamano, (Sun Sep 6, 12:30 am)
Re: [PATCH 3/4] push: make non-fast-forward help message c ..., Jeff King, (Sun Sep 6, 12:32 am)
Re: [PATCH 3/4] push: make non-fast-forward help message c ..., Junio C Hamano, (Sun Sep 6, 12:52 am)
Re: [PATCH 3/4] push: make non-fast-forward help message c ..., Sverre Rabbelier, (Sun Sep 6, 4:30 am)
Re: [RFC/PATCH 0/4] make helpful messages optional, Matthieu Moy, (Sun Sep 6, 4:53 am)
Re: [PATCH 3/4] push: make non-fast-forward help message c ..., Nanako Shiraishi, (Sun Sep 6, 5:44 pm)
Re: [PATCH 3/4] push: make non-fast-forward help message c ..., Johannes Sixt, (Mon Sep 7, 12:35 am)
Re: [PATCH 3/4] push: make non-fast-forward help message c ..., Mike Hommey, (Mon Sep 7, 12:40 am)
Re: [PATCH 3/4] push: make non-fast-forward help message c ..., Jeff King, (Mon Sep 7, 1:24 am)
Re: [PATCH 3/4] push: make non-fast-forward help message c ..., Matthieu Moy, (Mon Sep 7, 1:34 am)
Re: [PATCH 3/4] push: make non-fast-forward help message c ..., Jeff King, (Mon Sep 7, 1:54 am)
Re: [PATCH 3/4] push: make non-fast-forward help message c ..., Matthieu Moy, (Mon Sep 7, 4:20 am)
Re: [PATCH 3/4] push: make non-fast-forward help message c ..., Uri Okrent, (Tue Sep 8, 11:51 am)
Re: [PATCH 3/4] push: make non-fast-forward help message c ..., Jeff King, (Wed Sep 9, 4:22 am)
[PATCH 0/2] configurable advice messages, Jeff King, (Wed Sep 9, 4:26 am)
[PATCH 1/2] push: make non-fast-forward help message confi ..., Jeff King, (Wed Sep 9, 4:38 am)
[PATCH 2/2] status: make &quot;how to stage&quot; messages optional, Jeff King, (Wed Sep 9, 4:43 am)
Re: [PATCH 1/2] push: make non-fast-forward help message c ..., Junio C Hamano, (Wed Sep 9, 12:06 pm)
Re: [PATCH 1/2] push: make non-fast-forward help message c ..., Jeff King, (Wed Sep 9, 1:39 pm)
Re: [PATCH 1/2] push: make non-fast-forward help message c ..., Junio C Hamano, (Wed Sep 9, 2:47 pm)