From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 19 May 2011 06:35:51 +0000 (-0700)
Subject: Meta/Reintegrate: -u should default to safer "n" option
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d20798c67aa10e2a09e21c34eb701085968ca0cd;p=thirdparty%2Fgit.git

Meta/Reintegrate: -u should default to safer "n" option
---

diff --git a/Reintegrate b/Reintegrate
index 653a13229c..726e345294 100755
--- a/Reintegrate
+++ b/Reintegrate
@@ -152,7 +152,7 @@ then
 	then
 		echo >&2 "No changes."
 	else
-		echo >&2 -n "Update [Y/n]? "
+		echo >&2 -n "Update [y/N]? "
 		read yesno
 		case "$yesno" in
 		[Yy]*)