1.7 KiB
1.7 KiB
Git Add Methods
Git Add Lines
git add -e
Select lines of changes interactively. This allows you to stage only specific lines of changes in a file.
Pros: More control over what gets staged.
Cons: More manual work, you have to edit the patch file yourself, which can be error-prone and time-consuming.
Guidelines:
- staged changes are marked with a "+" at the beginning of the line.
- unstaged changes are marked with a "-" at the beginning of the line.
- unchanged lines are not marked.
- To stage a change, add a "+" at the beginning of the line.
- To unstage a change, add a "-" at the beginning of the line.
- To keep a line unchanged, leave it as is.
Git Add Hunks
git add -p
Select hunks of changes interactively. This allows you to stage only parts of the changes in a file.
Pros: Easier to use than the -e method for staging specific parts of changes.
Cons: Sometimes split won't work, which will force you to use the -e method.
Guidelines
- Run
git add -p <file>orgit add -pto go through patch hunks interactively. - For each hunk, choose:
yto stage this hunknto leave it unstagedsto split the hunk into smaller partseto edit the hunk manuallyqto quit and leave remaining hunks unstagedato stage this hunk and all remaining hunksdto leave this hunk and all remaining hunks unstaged
- 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; add+to lines to stage,-to lines to keep unstaged, then save and close. - When finished, run
git statusto verify which hunks were staged.