diff options
author | Justin Lebar <jlebar@google.com> | 2014-03-31 15:11:47 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-03-31 15:29:33 -0700 |
commit | 235e8d591480d7e1378c27fe65c5529625d4b5be (patch) | |
tree | ecfd18463fa83687c6926852b373d8040d403234 /git-add--interactive.perl | |
parent | comments: fix misuses of "nor" (diff) | |
download | tgif-235e8d591480d7e1378c27fe65c5529625d4b5be.tar.xz |
code and test: fix misuses of "nor"
Signed-off-by: Justin Lebar <jlebar@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-add--interactive.perl')
-rwxr-xr-x | git-add--interactive.perl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-add--interactive.perl b/git-add--interactive.perl index 24bb1ab992..32c2f9cf88 100755 --- a/git-add--interactive.perl +++ b/git-add--interactive.perl @@ -1156,9 +1156,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 +q - quit; do not $verb this hunk or 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 +d - do not $verb this hunk or 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 |