Merge branch 'dg/subtree-rebase-test' into maint
commit053e2fb5798374d1628b8cd4d797a64e48c944b6
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Jul 2016 18:25:49 +0000 (28 11:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Jul 2016 18:25:49 +0000 (28 11:25 -0700)
tree7f8b918039ba161a6e47c1abfc3a153aa1582caf
parente634160bf457f8b3a91125307681c9493f11afb2
parent5f35900849eef5d8cde864fbd06f37c475c22c0a
Merge branch 'dg/subtree-rebase-test' into maint

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