Merge branch 'dg/subtree-rebase-test'
commitfc8a3a607227297a5ec7b0ac60173a82b84b248f
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 Jul 2016 18:24:13 +0000 (13 11:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Jul 2016 18:24:13 +0000 (13 11:24 -0700)
treeed4d367dba8566c045a277d50b22c8af1be02e60
parent7aa46d2bc86c48a397f78f2385ca6e607b1e3a55
parent5f35900849eef5d8cde864fbd06f37c475c22c0a
Merge branch 'dg/subtree-rebase-test'

Add a test to specify the desired behaviour that currently is not
available in "git rebase -Xsubtree=...".

* dg/subtree-rebase-test:
  contrib/subtree: Add a test for subtree rebase that loses commits