tags 526014 + upstream patch
thanks
Hi Frédéric,
Frédéric Brière wrote:
> When invoking add --patch, the "a" and "d" commands only deal with the
> remaining hunks between the current one and the end of file.
How about this patch? I am not thrilled with the wording, but I
guess it is clearer than the existing wording.
If you are happy with the patch or only have minor tweaks, please
feel free to pass it on something like it to g...@vger.kernel.org
(cc-ing me).
If you would prefer a different behavior for add --patch, that’s
fine, too; feel free to start a thread upstream and cc me. I haven’t
thought hard about it myself.
Cheers,
Jonathan
-- %< --
Subject: add--interactive: Clarify “remaining hunks in the file”
When invoking add --patch, the "a" and "d" commands only deal with the
remaining hunks between the current one and the end of file. If any
previous hunk was skipped (via "j", "J" or "/"), that hunk will not be
added/removed like the others.
Reported-by: Frédéric Brière <fbri...@fbriere.net>
Signed-off-by: Jonathan Nieder <jrnie...@gmail.com>
---
Documentation/git-add.txt | 6 +++---
git-add--interactive.perl | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 51cbeb7..953c5d9 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -266,9 +266,9 @@ patch::
y - stage this hunk
n - do not stage this hunk
- q - quit, do not stage this hunk nor any of the remaining ones
- a - stage this and all the remaining hunks in the file
- d - do not stage this hunk nor any of the remaining hunks in the file
+ q - quit; do not stage this hunk nor any of the later ones
+ a - stage this and all the later hunks in the file
+ d - do not stage this hunk nor any of the later hunks in the file
g - select a hunk to go to
/ - search for a hunk matching the given regex
j - leave this hunk undecided, see next undecided hunk
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index cd43c34..21d8f27 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -1089,9 +1089,9 @@ sub help_patch_cmd {
print colored $help_color, <<EOF ;
y - $verb this hunk$target
n - do not $verb this hunk$target
-q - quit, do not $verb this hunk nor any of the remaining ones
-a - $verb this and all the remaining hunks in the file
-d - do not $verb this hunk nor any of the remaining hunks in the file
+q - quit; do not $verb this hunk nor any of the later ones
+a - $verb this and all the later hunks in the file
+d - do not $verb this hunk nor any of the later hunks in the file
g - select a hunk to go to
/ - search for a hunk matching the given regex
j - leave this hunk undecided, see next undecided hunk
--
1.7.0
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
