mirror of
https://github.com/git/git
synced 2024-10-30 04:01:21 +00:00
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>
This commit is contained in:
parent
2ea3c17189
commit
57886bc7fb
1 changed files with 7 additions and 7 deletions
|
@ -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) {
|
||||
|
|
Loading…
Reference in a new issue