diff options
| author |  David A. Greene <greened@obbligato.org> | 2016-06-28 05:54:02 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-06-28 09:21:28 -0700 |
| commit | 5f35900849eef5d8cde864fbd06f37c475c22c0a (patch) | |
| tree | 9075c65c96c4c609c2e354766101a52ef66ebf0f /xdiff/xemit.c | |
| parent | Git 2.7 (diff) | |
| download | tgif-5f35900849eef5d8cde864fbd06f37c475c22c0a.tar.xz | |
contrib/subtree: Add a test for subtree rebase that loses commits
This test merges an external tree in as a subtree, makes some commits
on top of it and splits it back out. In the process the added commits
are lost or the rebase aborts with an internal error. The tests are
marked to expect failure so that we don't forget to fix it.
Signed-off-by: David A. Greene <greened@obbligato.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xemit.c')
0 files changed, 0 insertions, 0 deletions