]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d528044 d3a9295)
Merge branch 'en/merge-unstash-only-on-clean-merge'
authorJunio C Hamano <gitster@pobox.com>
Thu, 1 Sep 2022 20:40:18 +0000 (13:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 1 Sep 2022 20:40:18 +0000 (13:40 -0700)
commit3a4779086deb12d406f819a619cc28924461f1a4
treeeeb561dc9b266d4b1887762ef90253d51364fe4btree
parentd528044c83cc1f5fb925fbb043110f5fb0382f99commit | diff
parentd3a9295ada961012bfe8582540e40a02e772aa09commit | diff
Merge branch 'en/merge-unstash-only-on-clean-merge'

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
builtin/merge.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.