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

* mm/maint-add-p-quit:
  git add -p: add missing "q" to patch prompt
This commit is contained in:
Junio C Hamano 2009-04-20 03:39:38 -07:00
commit 21590d5262

View File

@ -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) {