From: William Pursell Date: Thu, 27 Nov 2008 04:07:52 +0000 (+0000) Subject: git-add -i/-p: Change prompt separater from slash to comma X-Git-Tag: v1.6.2-rc0~1^2~7 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=57886bc7fb9413becf4c240320d61bf641600762;p=git.git git-add -i/-p: Change prompt separater from slash to comma Otherwise the find command '/' soon to be introduced will be hard to see. Signed-off-by: William Pursell Signed-off-by: Junio C Hamano --- diff --git a/git-add--interactive.perl b/git-add--interactive.perl index ca60356d0..ca5036334 100755 --- a/git-add--interactive.perl +++ b/git-add--interactive.perl @@ -929,22 +929,22 @@ sub patch_update_file { for ($i = 0; $i < $ix; $i++) { if (!defined $hunk[$i]{USE}) { $prev = 1; - $other .= '/k'; + $other .= ',k'; last; } } if ($ix) { - $other .= '/K'; + $other .= ',K'; } for ($i = $ix + 1; $i < $num; $i++) { if (!defined $hunk[$i]{USE}) { $next = 1; - $other .= '/j'; + $other .= ',j'; last; } } if ($ix < $num - 1) { - $other .= '/J'; + $other .= ',J'; } if ($num > 1) { $other .= '/g'; @@ -958,13 +958,13 @@ sub patch_update_file { last if (!$undecided); if (hunk_splittable($hunk[$ix]{TEXT})) { - $other .= '/s'; + $other .= ',s'; } - $other .= '/e'; + $other .= ',e'; for (@{$hunk[$ix]{DISPLAY}}) { print; } - print colored $prompt_color, "Stage this hunk [y/n/a/d$other/?]? "; + print colored $prompt_color, "Stage this hunk [y,n,a,d$other,?]? "; my $line = ; if ($line) { if ($line =~ /^y/i) {