diff options
| author | Jonas Bernoulli <jonas@bernoul.li> | 2021-08-08 18:22:22 +0200 |
|---|---|---|
| committer | Jonas Bernoulli <jonas@bernoul.li> | 2021-08-08 18:41:04 +0200 |
| commit | 0e12e87706a386f200bab9e0208ee87b830809e9 (patch) | |
| tree | 0991d33c84bae1089d3b6b86a462986987a44f0f /Documentation | |
| parent | a990a44c96dc069bb52800b923c466acc6d5f369 (diff) | |
magit-stash-both: Ask before losing merge state
Like some "git stash save" variants, `magit-stash-both' calls "git
reset --hard", which among other things discards merge state. This
is intentional but likely surprising so ask users if they really
want that.
Closes #4345.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes/3.3.0.org | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/RelNotes/3.3.0.org b/Documentation/RelNotes/3.3.0.org index 55efbcc..02b883e 100644 --- a/Documentation/RelNotes/3.3.0.org +++ b/Documentation/RelNotes/3.3.0.org @@ -5,6 +5,8 @@ - No longer automatically add ~--full-history~ when showing log for a single file that isn't being tracked anymore. #4381 +- ~magit-stash-both~ now asks before discarding merge state. #4345 + ** Fixes since v3.2.0 - Make ~magit-branch-remote-head~ and ~magit-branch-current~ fall back |