diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-06-12 22:32:51 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-13 10:05:02 -0700 |
| commit | 74e42ce122bfcbd2e1a06395b80d6a4b44580148 (patch) | |
| tree | c252167a9dc6cf3bbd2442401c0d97b20cc81eb8 /Documentation | |
| parent | 0d4dbcd35e89a549055e34daf410e4579571b984 (diff) | |
| download | git-74e42ce122bfcbd2e1a06395b80d6a4b44580148.tar.gz git-74e42ce122bfcbd2e1a06395b80d6a4b44580148.tar.xz | |
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 'Documentation')
| -rw-r--r-- | Documentation/git-add.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 51cbeb703..74741a42f 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 |