diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-10-17 14:02:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-10-17 14:02:17 -0700 |
| commit | cd6c082b4407b1e217ee36f50498615602e57bf3 (patch) | |
| tree | 27b575cb01b26cd3f939f83844613cd39d13c2c6 /Documentation | |
| parent | 282a9684ab6f176e830665ca1071a85d59bb6665 (diff) | |
| parent | 208e23ea47ad71c20246ff234efa3abc8080513f (diff) | |
| download | git-cd6c082b4407b1e217ee36f50498615602e57bf3.tar.xz | |
Merge branch 'rs/add-patch-options-fix'
The code in "git add -p" and friends to iterate over hunks was
riddled with bugs, which has been corrected.
* rs/add-patch-options-fix:
add-patch: reset "permitted" at loop start
add-patch: let options a and d roll over like y and n
add-patch: let options k and K roll over like j and J
add-patch: let options y, n, j, and e roll over to next undecided
add-patch: document that option J rolls over
add-patch: improve help for options j, J, k, and K
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-add.adoc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-add.adoc b/Documentation/git-add.adoc index ad629c46c5..3116a2cac5 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, roll over at the bottom + J - go to the next hunk, roll over at the bottom + k - go to the previous undecided hunk, roll over at the top + K - go to the previous hunk, roll over at the top s - split the current hunk into smaller hunks e - manually edit the current hunk p - print the current hunk |