From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 3 May 2009 22:02:46 +0000 (-0700)
Subject: Merge branch 'mm/maint-add-p-quit' into maint
X-Git-Tag: v1.6.2.5~5
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/00473fd1968ee887093dc66c616112f9dd2891ab?hp=7d71be242d7fc8bd2eaef90e1848d71609c5c577

Merge branch 'mm/maint-add-p-quit' into maint

* mm/maint-add-p-quit:
git add -p: add missing "q" to patch prompt
---

diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 566e3710f5..5407b2e1b8 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -1045,7 +1045,7 @@ sub patch_update_file {
 		}
 		print colored $prompt_color, 'Stage ',
 		  ($hunk[$ix]{TYPE} eq 'mode' ? 'mode change' : 'this hunk'),
-		  " [y,n,a,d,/$other,?]? ";
+		  " [y,n,q,a,d,/$other,?]? ";
 		my $line = prompt_single_character;
 		if ($line) {
 			if ($line =~ /^y/i) {