summaryrefslogtreecommitdiff
path: root/git-add--interactive.perl
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-06-13 03:32:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-13 17:05:02 (GMT)
commit74e42ce122bfcbd2e1a06395b80d6a4b44580148 (patch)
treec252167a9dc6cf3bbd2442401c0d97b20cc81eb8 /git-add--interactive.perl
parent0d4dbcd35e89a549055e34daf410e4579571b984 (diff)
downloadgit-74e42ce122bfcbd2e1a06395b80d6a4b44580148.zip
git-74e42ce122bfcbd2e1a06395b80d6a4b44580148.tar.gz
git-74e42ce122bfcbd2e1a06395b80d6a4b44580148.tar.bz2
add-interactive: Clarify “remaining hunks in the file”
The "a" and "d" commands to ‘add --patch’ (accept/reject rest of file) interact with "j", "g", and "/" (skip some hunks) in a perhaps confusing way: after accepting or rejecting all _later_ hunks in the file, they return to the earlier, skipped hunks and prompt the user about them again. This behavior can be very useful in practice. One can still accept or reject _all_ undecided hunks in a file by using the "g" command to move to hunk #1 first. Reported-by: Frédéric Brière <fbriere@fbriere.net> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-add--interactive.perl')
-rwxr-xr-xgit-add--interactive.perl6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 21f1330..27fc793 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -1111,9 +1111,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 remaining ones
+a - $verb this hunk and all 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