My Various Git Projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fffbf7c ab5af82)
Merge branch 'nd/checkout-f-while-conflicted-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Apr 2019 10:28:07 +0000 (19:28 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Apr 2019 10:28:07 +0000 (19:28 +0900)
"git checkout -f <branch>" while the index has an unmerged path
incorrectly left some paths in an unmerged state, which has been
corrected.

* nd/checkout-f-while-conflicted-fix:
  unpack-trees: fix oneway_merge accidentally carry over stage index


Trivial merge
The core git plumbing