summaryrefslogtreecommitdiff
path: root/git-add--interactive.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-20 10:39:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-04-20 10:39:38 (GMT)
commit21590d5262f71b336926a9d2cec5b04b0aa6c4a0 (patch)
tree662395c3342bba6fb86898f4ea5521f0846571ec /git-add--interactive.perl
parent66996ecc28f001d3dcc73090717bb8c6e47c0d75 (diff)
parenta2fc8d65368a23a8a5f708b36c761c2d0d133ea6 (diff)
downloadgit-21590d5262f71b336926a9d2cec5b04b0aa6c4a0.zip
git-21590d5262f71b336926a9d2cec5b04b0aa6c4a0.tar.gz
git-21590d5262f71b336926a9d2cec5b04b0aa6c4a0.tar.bz2
Merge branch 'mm/maint-add-p-quit'
* mm/maint-add-p-quit: git add -p: add missing "q" to patch prompt
Diffstat (limited to 'git-add--interactive.perl')
-rwxr-xr-xgit-add--interactive.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 60dd1b5..f6e536e 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -1049,7 +1049,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) {