summaryrefslogtreecommitdiff
path: root/git-add--interactive.perl
diff options
context:
space:
mode:
authorWilliam Pursell <bill.pursell@gmail.com>2008-11-27 04:07:52 +0000
committerJunio C Hamano <gitster@pobox.com>2009-02-01 19:43:37 -0800
commit57886bc7fb9413becf4c240320d61bf641600762 (patch)
treef2e74246e12cead46c513cce1b56270b2accaebf /git-add--interactive.perl
parent2ea3c17189bf9ca459879129ca190792b5451f05 (diff)
downloadgit-57886bc7fb9413becf4c240320d61bf641600762.tar.gz
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 <bill.pursell@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-add--interactive.perl')
-rwxr-xr-xgit-add--interactive.perl14
1 files changed, 7 insertions, 7 deletions
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index ca60356d00..ca50363341 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 = <STDIN>;
if ($line) {
if ($line =~ /^y/i) {