git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4cc676c 5b1c54a)
Merge branch 'ew/empty-merge-with-dirty-index'
authorJunio C Hamano <redacted>
Wed, 10 Jan 2018 22:01:25 +0000 (14:01 -0800)
committerJunio C Hamano <redacted>
Wed, 10 Jan 2018 22:01:25 +0000 (14:01 -0800)
commita466ef018ee9106f6e5b6247f32e7f1fb6a25577
treec864e5b32795dc60892515d60677b00704fe8bddtree | snapshot
parent4cc676c46cf07d0302d36e4aea9ecf847510383ecommit | diff
parent5b1c54ac99e6847eaff409cd6fb328fd0f8d9076commit | diff
Merge branch 'ew/empty-merge-with-dirty-index'

"git merge -s recursive" did not correctly abort when the index is
dirty, if the merged tree happened to be the same as the current
HEAD, which has been fixed.

* ew/empty-merge-with-dirty-index:
  merge-recursive: do not look at the index during recursive merge
git clone https://git.99rst.org/PROJECT