diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-06-13 21:47:17 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-06-13 21:47:17 +0400 |
commit | d5c48c531816102d3a86fd807fb19e661a3787d5 (patch) | |
tree | 931ffa31daf296279e7819496c39d919ce87191d | |
parent | ad709ea985b527adb546f4c841fbd480f2c6bdfd (diff) | |
parent | 74e42ce122bfcbd2e1a06395b80d6a4b44580148 (diff) |
Merge branch 'maint'
* maint:
add-interactive: Clarify “remaining hunks in the file”
-rw-r--r-- | Documentation/git-add.txt | 6 | ||||
-rwxr-xr-x | 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 51cbeb7032..74741a42f4 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 remaining ones + a - stage this hunk and all 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 21f1330a5b..27fc79347a 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 |