]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit04f879a7fb86048a0b6e9ea58a4d7d058bffde0b
treec7bf24526c6c81f0764c517d69f385f551f1a209tree | snapshot
parentfffbf7c6ba3a3653b92329f879d238e6fea4dfcecommit | diff
parentab5af825db8beaf623f8ac95e4b4179ec1b9569ecommit | diff
Merge branch 'nd/checkout-f-while-conflicted-fix'

"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
Unnamed repository; edit this file 'description' to name the repository.