From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: William Pursell <bill.pursell@gmail.com>
Subject: [PATCH 1/3] git-add -i/-p: Change prompt separater from slash to comma
Date: Sun, 1 Feb 2009 19:42:37 -0800 [thread overview]
Message-ID: <1233546159-30347-2-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1233546159-30347-1-git-send-email-gitster@pobox.com>
From: William Pursell <bill.pursell@gmail.com>
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 | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index ca60356..ca50363 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) {
--
1.6.1.2.331.g8c4c8
next prev parent reply other threads:[~2009-02-02 3:44 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-02 3:42 [PATCH 0/3] "add -p" enhancements Junio C Hamano
2009-02-02 3:42 ` Junio C Hamano [this message]
2009-02-02 3:42 ` [PATCH 2/3] Add / command in add --patch Junio C Hamano
2009-02-02 3:42 ` [PATCH 3/3] In add --patch, Handle K,k,J,j slightly more gracefully Junio C Hamano
2009-02-02 7:39 ` [PATCH 1/3] git-add -i/-p: Change prompt separater from slash to comma William Pursell
2009-02-02 7:49 ` Junio C Hamano
2009-02-02 9:17 ` William Pursell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1233546159-30347-2-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=bill.pursell@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).