diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-09-01 13:40:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-09-01 13:40:18 -0700 |
| commit | 3a4779086deb12d406f819a619cc28924461f1a4 (patch) | |
| tree | eeb561dc9b266d4b1887762ef90253d51364fe4b /contrib/persistent-https/Makefile | |
| parent | d528044c83cc1f5fb925fbb043110f5fb0382f99 (diff) | |
| parent | d3a9295ada961012bfe8582540e40a02e772aa09 (diff) | |
| download | git-3a4779086deb12d406f819a619cc28924461f1a4.tar.gz git-3a4779086deb12d406f819a619cc28924461f1a4.zip | |
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
Diffstat (limited to 'contrib/persistent-https/Makefile')
0 files changed, 0 insertions, 0 deletions