summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-05-03 15:02:46 -0700
committerJunio C Hamano <gitster@pobox.com>2009-05-03 15:02:46 -0700
commit00473fd1968ee887093dc66c616112f9dd2891ab (patch)
tree9b5c948f46b646dfc6bd628ac4ad2408f3c1a641
parent7d71be242d7fc8bd2eaef90e1848d71609c5c577 (diff)
parenta2fc8d65368a23a8a5f708b36c761c2d0d133ea6 (diff)
downloadgit-00473fd1968ee887093dc66c616112f9dd2891ab.tar.gz
Merge branch 'mm/maint-add-p-quit' into maint
* mm/maint-add-p-quit: git add -p: add missing "q" to patch prompt
-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 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) {