feat: split out reset from the revert. First the safe path then the advanced path

This commit is contained in:
Bjarke Sporring
2026-01-11 23:02:48 +01:00
parent 039debe744
commit 8d63b2d22e
20 changed files with 2618 additions and 607 deletions

View File

@@ -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