feat: split out reset from the revert. First the safe path then the advanced path
This commit is contained in:
@@ -247,6 +247,16 @@ git revert --abort
|
||||
```
|
||||
Abort a revert in progress.
|
||||
|
||||
```bash
|
||||
git revert -m 1 <merge-commit>
|
||||
```
|
||||
Revert a merge commit (requires -m flag to specify which parent to keep). Use `-m 1` to keep the branch you merged into (most common).
|
||||
|
||||
```bash
|
||||
git revert -m 2 <merge-commit>
|
||||
```
|
||||
Revert a merge commit but keep the branch that was merged in (rare).
|
||||
|
||||
### Cherry-Pick
|
||||
|
||||
```bash
|
||||
|
||||
Reference in New Issue
Block a user