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

* mm/maint-add-p-quit: git add -p: add missing "q" to patch prompt
git-mirror · May 3, 2009 · 00473fd · 00473fd
2 parents 7d71be2 + a2fc8d6
commit 00473fd
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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) {