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 566e3710f5275bb751965744ff1d53ecaa809c97..5407b2e1b88cef5b9124ef9dca79cd1f95018bae 100755 (executable)
--- 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) {