diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-04-09 12:03:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-09 12:03:26 -0700 |
| commit | 3c9e56b75c4a9a6832d94a00f079ea68e8a281ca (patch) | |
| tree | 5f5b11703f64319bcb71603c825d382f4703a763 /git-add--interactive.perl | |
| parent | fbae3d9ace0b71f8db62cde127fa6fe24c40380c (diff) | |
| parent | 235e8d591480d7e1378c27fe65c5529625d4b5be (diff) | |
| download | git-3c9e56b75c4a9a6832d94a00f079ea68e8a281ca.tar.xz | |
Merge branch 'jl/nor-or-nand-and' into maint
* jl/nor-or-nand-and:
code and test: fix misuses of "nor"
comments: fix misuses of "nor"
contrib: fix misuses of "nor"
Documentation: fix misuses of "nor"
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 |