summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge-ours.sh
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2010-06-12 22:32:51 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-06-13 10:05:02 -0700
commit74e42ce122bfcbd2e1a06395b80d6a4b44580148 (patch)
treec252167a9dc6cf3bbd2442401c0d97b20cc81eb8 /contrib/examples/git-merge-ours.sh
parentt/README: document --root option (diff)
downloadtgif-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 'contrib/examples/git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions