From 74e42ce122bfcbd2e1a06395b80d6a4b44580148 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Sat, 12 Jun 2010 22:32:51 -0500 Subject: =?UTF-8?q?add-interactive:=20Clarify=20=E2=80=9Cremaining=20hunks?= =?UTF-8?q?=20in=20the=20file=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- git-add--interactive.perl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'git-add--interactive.perl') 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, <