From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Jul 2016 18:24:13 +0000 (-0700)
Subject: Merge branch 'dg/subtree-rebase-test'
X-Git-Tag: v2.10.0-rc0~126
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc8a3a607227297a5ec7b0ac60173a82b84b248f;p=thirdparty%2Fgit.git

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

fc8a3a607227297a5ec7b0ac60173a82b84b248f