diff options
| author | Jonas Bernoulli <jonas@bernoul.li> | 2023-11-17 19:00:27 +0100 |
|---|---|---|
| committer | Jonas Bernoulli <jonas@bernoul.li> | 2023-11-17 19:00:27 +0100 |
| commit | fb1a3c487eabe51f2bf5f80cb9a6d9e43172f8b0 (patch) | |
| tree | 848317b98de205109b3884fa8973ca1e5c2420d9 /docs | |
| parent | 26eac2bcb0a9ffeddf3383213c67f2184f3ea1b0 (diff) | |
magit-sequencer-abort: Require confirmation
Closes #5051.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/magit.org | 7 | ||||
| -rw-r--r-- | docs/magit.texi | 9 |
2 files changed, 16 insertions, 0 deletions
diff --git a/docs/magit.org b/docs/magit.org index 41a40ba..2571325 100644 --- a/docs/magit.org +++ b/docs/magit.org @@ -1460,6 +1460,13 @@ telling Magit to ask fewer questions. - ~reset-bisect~ Aborting (known to Git as "resetting") a bisect operation loses all information collected so far. + - ~abort-cherry-pick~ Aborting a cherry-pick throws away all + conflict resolutions which has already been carried out by the + user. + + - ~abort-revert~ Aborting a revert throws away all conflict + resolutions which has already been carried out by the user. + - ~abort-rebase~ Aborting a rebase throws away all already modified commits, but it's possible to restore those from the reflog. diff --git a/docs/magit.texi b/docs/magit.texi index 9af3b5c..e131d1e 100644 --- a/docs/magit.texi +++ b/docs/magit.texi @@ -1935,6 +1935,15 @@ Sequences: operation loses all information collected so far. @item +@code{abort-cherry-pick} Aborting a cherry-pick throws away all +conflict resolutions which has already been carried out by the +user. + +@item +@code{abort-revert} Aborting a revert throws away all conflict +resolutions which has already been carried out by the user. + +@item @code{abort-rebase} Aborting a rebase throws away all already modified commits, but it's possible to restore those from the reflog. |