| commit | 74e42ce122bfcbd2e1a06395b80d6a4b44580148 | |
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Sun, 13 Jun 2010 03:32:51 +0000 (12 22:32 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 13 Jun 2010 17:05:02 +0000 (13 10:05 -0700) | ||
| tree | c252167a9dc6cf3bbd2442401c0d97b20cc81eb8 | treesnapshot (tar.gz zip) |
| parent | 0d4dbcd35e89a549055e34daf410e4579571b984 | commitdiff |
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>
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>
| Documentation/git-add.txt | diffblobblamehistory | |
| git-add--interactive.perl | diffblobblamehistory |