diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-04-20 03:39:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-20 03:39:38 -0700 |
| commit | 21590d5262f71b336926a9d2cec5b04b0aa6c4a0 (patch) | |
| tree | 662395c3342bba6fb86898f4ea5521f0846571ec | |
| parent | Sync with 1.6.2.4 (diff) | |
| parent | git add -p: add missing "q" to patch prompt (diff) | |
| download | tgif-21590d5262f71b336926a9d2cec5b04b0aa6c4a0.tar.xz | |
Merge branch 'mm/maint-add-p-quit'
* mm/maint-add-p-quit:
git add -p: add missing "q" to patch prompt
| -rwxr-xr-x | git-add--interactive.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-add--interactive.perl b/git-add--interactive.perl index 60dd1b5be2..f6e536ece3 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) { |