This continues Julia Evans's excellent work updating the git-reset docs.
Changes in v3:
- Adjust "git reset -p" description per Junio's review
Changes in v2:
- Mostly address Junio's review while keeping to Julia's style (?),
taking at a stab at a few gray areas.
- I left alone the first patch, the commented-upon part of which is
later rewritten anyway.
v1: https://lore.kernel.org/git/pull.1991.git.1760731558.gitgitgadget@gmail.com/
v2: https://lore.kernel.org/git/cover.1766103827.git.ben.knoble+github@gmail.com/
Published-as: https://github.com/benknoble/git/tree/bk/je/doc-reset
Generated-with: git format-patch -v3 --in-reply-to=cover.1766103827.git.ben.knoble+github@gmail.com --range-diff=d6582dc53ca852ef01421d2dd2c446dadb731dad~4..d6582dc53ca852ef01421d2dd2c446dadb731dad -o PATCHES origin.. --cc 'Julia Evans <julia@jvns.ca>'
Julia Evans (4):
doc: git-reset: reorder the forms
doc: git-reset: clarify intro
doc: git-reset: clarify `git reset [mode]`
doc: git-reset: clarify `git reset <pathspec>`
Documentation/git-reset.adoc | 105 ++++++++++++++++++-----------------
1 file changed, 54 insertions(+), 51 deletions(-)
Diff-intervalle contre v2 :
1: a558c5a868 = 1: a558c5a868 doc: git-reset: reorder the forms
2: f90be8559f = 2: f90be8559f doc: git-reset: clarify intro
3: 89c87c14aa = 3: 89c87c14aa doc: git-reset: clarify `git reset [mode]`
4: d6582dc53c ! 4: 96566265d8 doc: git-reset: clarify `git reset <pathspec>`
@@ Documentation/git-reset.adoc: linkgit:git-add[1]).
- in reverse to the index.
+ Interactively select changes from the difference between the index
+ and the specified commit or tree (which defaults to `HEAD`).
-+ The chosen changes are added to the index.
++ The index is modified using the chosen changes.
+
This means that `git reset -p` is the opposite of `git add -p`, i.e.
-you can use it to selectively reset hunks. See the "Interactive Mode"base-commit: f229982df19c327876ce7ded40f6efefe20da5d4
D. Ben Knoble <ben.knoble+github@gmail.com>