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

gitster · gitster · commit 21590d5262f7 · 2009-04-20T03:39:38.000-07:00
* mm/maint-add-p-quit:
  git add -p: add missing "q" to patch prompt
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -1049,7 +1049,7 @@ sub patch_update_file {`
`1049`	`1049`	`}`
`1050`	`1050`	`print colored $prompt_color, 'Stage ',`
`1051`	`1051`	`($hunk[$ix]{TYPE} eq 'mode' ? 'mode change' : 'this hunk'),`
`1052`		`- " [y,n,a,d,/$other,?]? ";`
	`1052`	`+ " [y,n,q,a,d,/$other,?]? ";`
`1053`	`1053`	`my $line = prompt_single_character;`
`1054`	`1054`	`if ($line) {`
`1055`	`1055`	`if ($line =~ /^y/i) {`