| commit | 4f96fcc9a2a2d756c5523c49a57f97b53c9cadb6 | |
| author | Techlive Zheng <techlivezheng@gmail.com> | |
| Fri, 13 Nov 2015 02:32:33 +0000 (12 20:32 -0600) | ||
| committer | Jeff King <peff@peff.net> | |
| Fri, 13 Nov 2015 05:02:56 +0000 (13 00:02 -0500) | ||
| tree | 87ee90beae8f2f3a721e3e28d0dae6069155941f | treesnapshot (tar.gz zip) |
| parent | c9924996c95cfcc7633448e7ee8b88f440ccbd2b | commitdiff |
contrib/subtree: Add merge tests
Add some tests for various merge operations. Test combinations of merge
with --message, --prefix and --squash.
Signed-off-by: Techlive Zheng <techlivezheng@gmail.com>
Signed-off-by: David A. Greene <greened@obbligato.org>
Signed-off-by: Jeff King <peff@peff.net>
Add some tests for various merge operations. Test combinations of merge
with --message, --prefix and --squash.
Signed-off-by: Techlive Zheng <techlivezheng@gmail.com>
Signed-off-by: David A. Greene <greened@obbligato.org>
Signed-off-by: Jeff King <peff@peff.net>
| contrib/subtree/t/t7900-subtree.sh | diffblobblamehistory |