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:
commit
21590d5262
@ -1049,7 +1049,7 @@ sub patch_update_file {
|
|||||||
}
|
}
|
||||||
print colored $prompt_color, 'Stage ',
|
print colored $prompt_color, 'Stage ',
|
||||||
($hunk[$ix]{TYPE} eq 'mode' ? 'mode change' : 'this hunk'),
|
($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;
|
my $line = prompt_single_character;
|
||||||
if ($line) {
|
if ($line) {
|
||||||
if ($line =~ /^y/i) {
|
if ($line =~ /^y/i) {
|
||||||
|
Loading…
Reference in New Issue
Block a user