]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4f06dfd d3a9295)
Merge branch 'en/merge-unstash-only-on-clean-merge' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 Sep 2022 19:21:11 +0000 (12:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Sep 2022 19:21:11 +0000 (12:21 -0700)
The auto-stashed local changes created by "git merge --autostash"
was mixed into a conflicted state left in the working tree, which
has been corrected.

* en/merge-unstash-only-on-clean-merge:
  merge: only apply autostash when appropriate

1  2 
builtin/merge.c patch | diff1 | diff2 | blob | history

diff --cc builtin/merge.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.