]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit2c75b3255b1d1f525c7c61b540b99af1ad84e8f8
tree34494132932eb5d43799c67a4cd9e087b72df58atree | snapshot
parent4f06dfde7aa55a444600c804559b44bf9bf764d2commit | diff
parentd3a9295ada961012bfe8582540e40a02e772aa09commit | diff
Merge branch 'en/merge-unstash-only-on-clean-merge' into maint

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.