From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Feb 2016 22:54:15 +0000 (-0800)
Subject: Merge branch 'dw/subtree-split-do-not-drop-merge' into maint
X-Git-Tag: v2.7.1~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a65bdcc8c610b31fff6a171e6f49045c3980027;p=thirdparty%2Fgit.git

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

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
---

6a65bdcc8c610b31fff6a171e6f49045c3980027