update add -p
This commit is contained in:
25
git/add.md
25
git/add.md
@@ -27,13 +27,20 @@ Cons: Sometimes split won't work, which will force you to use the -e method.
|
|||||||
#### Guidelines
|
#### Guidelines
|
||||||
- Run `git add -p <file>` or `git add -p` to go through patch hunks interactively.
|
- Run `git add -p <file>` or `git add -p` to go through patch hunks interactively.
|
||||||
- For each hunk, choose:
|
- For each hunk, choose:
|
||||||
- `y` to stage this hunk
|
- `y` to stage the hunk
|
||||||
- `n` to leave it unstaged
|
- `n` to not stage the hunk
|
||||||
- `s` to split the hunk into smaller parts
|
- `q` to quit; do not stage the hunk or any remaining ones
|
||||||
- `e` to edit the hunk manually
|
- `a` to stage the hunk and all later hunks in the file
|
||||||
- `q` to quit and leave remaining hunks unstaged
|
- `d` to not stage the hunk or any later hunks in the file
|
||||||
- `a` to stage this hunk and all remaining hunks
|
- `g` to select a hunk to go to
|
||||||
- `d` to leave this hunk and all remaining hunks unstaged
|
- `/` to search for a hunk matching the given regex
|
||||||
|
- `j` to go to the next hunk
|
||||||
|
- `J` to go to the previous hunk
|
||||||
|
- `k` to go to the previous hunk
|
||||||
|
- `K` to go to the previous undecided hunk
|
||||||
|
- `s` to split the current hunk into smaller ones
|
||||||
|
- `e` to manually edit the current hunk
|
||||||
|
- `?` to print help
|
||||||
- If you choose `s`, Git will attempt to split the hunk into smaller hunks so you can stage a smaller section.
|
- If you choose `s`, Git will attempt to split the hunk into smaller hunks so you can stage a smaller section.
|
||||||
- If you choose `e`, Git opens the patch in a temporary editor; delete `+` or `-` lines you do NOT want staged, then save and close.
|
- If you choose `e`, Git opens the patch in a temporary editor; delete `+` lines you do NOT want staged and convert `-` lines to spaces to prevent staging their deletion, then save and close.
|
||||||
- When finished, run `git status` to verify which hunks were staged.
|
- When finished, run `git status` to verify which hunks were staged.
|
||||||
|
|||||||
Reference in New Issue
Block a user