Imported Upstream version 2.27.0

[platform/upstream/git.git] / Documentation / git-merge.txt

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 092529c..3819fad 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -94,7 +94,8 @@ will be appended to the specified message.
 
 --abort::
        Abort the current conflict resolution process, and
-       try to reconstruct the pre-merge state.
+       try to reconstruct the pre-merge state. If an autostash entry is
+       present, apply it to the worktree.
 +
 If there were uncommitted worktree changes present when the merge
 started, 'git merge --abort' will in some cases be unable to
@@ -102,11 +103,15 @@ reconstruct these changes. It is therefore recommended to always
 commit or stash your changes before running 'git merge'.
 +
 'git merge --abort' is equivalent to 'git reset --merge' when
-`MERGE_HEAD` is present.
+`MERGE_HEAD` is present unless `MERGE_AUTOSTASH` is also present in
+which case 'git merge --abort' applies the stash entry to the worktree
+whereas 'git reset --merge' will save the stashed changes in the stash
+list.
 
 --quit::
        Forget about the current merge in progress. Leave the index
-       and the working tree as-is.
+       and the working tree as-is. If `MERGE_AUTOSTASH` is present, the
+       stash entry will be saved to the stash list.
 
 --continue::
        After a 'git merge' stops due to conflicts you can conclude the