Andrew's git / gitweb.git / diff
?
Merge branch 'dg/subtree-rebase-test'
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 Jul 2016 18:24:13 +0000 (11:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Jul 2016 18:24:13 +0000 (11:24 -0700)
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

Trivial merge