Code

git-add -i/-p: Change prompt separater from slash to comma
authorWilliam Pursell <bill.pursell@gmail.com>
Thu, 27 Nov 2008 04:07:52 +0000 (04:07 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 Feb 2009 03:43:37 +0000 (19:43 -0800)
Otherwise the find command '/' soon to be introduced will be hard to see.

Signed-off-by: William Pursell <bill.pursell@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-add--interactive.perl

index ca60356d0082123cd1e9572572528d8265be43a3..ca50363341d8c71e158c2e82e440042227969778 100755 (executable)
@@ -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 = <STDIN>;
                if ($line) {
                        if ($line =~ /^y/i) {