[PATCH v3 1/6] add-patch: improve help for options j, J, k, and K
From: René Scharfe <hidden>
Date: 2025-10-06 17:19:25
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
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 <redacted> --- Documentation/git-add.adoc | 8 ++++---- add-patch.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Documentation/git-add.adoc b/Documentation/git-add.adoc
index ad629c46c5..3266ccf105 100644
--- a/Documentation/git-add.adoc
+++ b/Documentation/git-add.adoc@@ -342,10 +342,10 @@ patch:: d - do not stage this hunk or 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 - J - leave this hunk undecided, see next hunk - k - leave this hunk undecided, see previous undecided hunk - K - leave this hunk undecided, see previous hunk + j - go to the next undecided hunk + J - go to the next hunk + k - go to the previous undecided hunk + K - go to the previous hunk s - split the current hunk into smaller hunks e - manually edit the current hunk p - print the current hunk
diff --git a/add-patch.c b/add-patch.c
index b0389c5d5b..912266a3f8 100644
--- a/add-patch.c
+++ b/add-patch.c@@ -1397,10 +1397,10 @@ static size_t display_hunks(struct add_p_state *s, } static const char help_patch_remainder[] = -N_("j - leave this hunk undecided, see next undecided hunk\n" - "J - leave this hunk undecided, see next hunk\n" - "k - leave this hunk undecided, see previous undecided hunk\n" - "K - leave this hunk undecided, see previous hunk\n" +N_("j - go to the next undecided hunk\n" + "J - go to the next hunk\n" + "k - go to the previous undecided hunk\n" + "K - go to the previous hunk\n" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" "s - split the current hunk into smaller hunks\n"
--
2.51.0