averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

add-patch: improve help for options j, J, k, and K

Browse Source 
The options j, J, k, and K don't affect the status of the current hunk.
They just go to a different one.  This is true whether the current hunk
is undecided or not.  Avoid misunderstanding by no longer mentioning
the current hunk explicitly in their help texts.

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe
2025-10-06 19:19:23 +02:00
committed by Junio C Hamano
parent 5099f64a82
commit 2c3cc43f96
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/git-add.adoc
View File

@@ -342,10 +342,10 @@ patch::
d - do not stage this hunk or any of the later hunks in the file d - do not stage this hunk or any of the later hunks in the file
g - select a hunk to go to g - select a hunk to go to
/ - search for a hunk matching the given regex / - search for a hunk matching the given regex
j - leave this hunk undecided, see next undecided hunk j - go to the next undecided hunk
J - leave this hunk undecided, see next hunk J - go to the next hunk
k - leave this hunk undecided, see previous undecided hunk k - go to the previous undecided hunk
K - leave this hunk undecided, see previous hunk K - go to the previous hunk
s - split the current hunk into smaller hunks s - split the current hunk into smaller hunks
e - manually edit the current hunk e - manually edit the current hunk
p - print the current hunk p - print the current hunk

8
add-patch.c
View File

@@ -1397,10 +1397,10 @@ static size_t display_hunks(struct add_p_state *s,
} }
static const char help_patch_remainder[] = static const char help_patch_remainder[] =
N_("j - leave this hunk undecided, see next undecided hunk\n" N_("j - go to the next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n" "J - go to the next hunk\n"
"k - leave this hunk undecided, see previous undecided hunk\n" "k - go to the previous undecided hunk\n"
"K - leave this hunk undecided, see previous hunk\n" "K - go to the previous hunk\n"
"g - select a hunk to go to\n" "g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n" "/ - search for a hunk matching the given regex\n"
"s - split the current hunk into smaller hunks\n" "s - split the current hunk into smaller hunks\n"