diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-03 15:02:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-03 15:02:46 -0700 |
| commit | 00473fd1968ee887093dc66c616112f9dd2891ab (patch) | |
| tree | 9b5c948f46b646dfc6bd628ac4ad2408f3c1a641 | |
| parent | 7d71be242d7fc8bd2eaef90e1848d71609c5c577 (diff) | |
| parent | a2fc8d65368a23a8a5f708b36c761c2d0d133ea6 (diff) | |
| download | git-00473fd1968ee887093dc66c616112f9dd2891ab.tar.gz git-00473fd1968ee887093dc66c616112f9dd2891ab.tar.xz | |
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-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 566e3710f..5407b2e1b 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) { |