From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Feb 2016 22:16:03 +0000 (-0800)
Subject: Merge branch 'dw/subtree-split-do-not-drop-merge'
X-Git-Tag: v2.8.0-rc0~78
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dd65a9e5e3b6298e4fa52e21680008e7fd5556ea;p=git

Merge branch 'dw/subtree-split-do-not-drop-merge'

The "split" subcommand of "git subtree" (in contrib/) incorrectly
skipped merges when it shouldn't, which was corrected.

* dw/subtree-split-do-not-drop-merge:
  contrib/subtree: fix "subtree split" skipped-merge bug
---

dd65a9e5e3b6298e4fa52e21680008e7fd5556ea