dilim/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-08-03 06:31:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pb/merge-autostash-more'

Browse Source 
The local changes stashed by "git merge --autostash" were lost when
the merge failed in certain ways, which has been corrected.

* pb/merge-autostash-more:
  merge: apply autostash if merge strategy fails
  merge: apply autostash if fast-forward fails
  Documentation: define 'MERGE_AUTOSTASH'
  merge: add missing word "strategy" to a message
This commit is contained in:
Junio C Hamano
2021-08-04 13:28:54 -07:00
parent 1a6fb019d6 e082631e51
commit 5fef3b15db
3 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/merge-options.txt
View File

@@ -154,7 +154,8 @@ endif::git-pull[]
--autostash::
--no-autostash::
Automatically create a temporary stash entry before the operation
begins, and apply it after the operation ends. This means
begins, record it in the special ref `MERGE_AUTOSTASH`
and apply it after the operation ends. This means
that you can run the operation on a dirty worktree. However, use
with care: the final stash application after a successful
merge might result in non-trivial conflicts.