git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c992499)
contrib/subtree: Add merge tests
authorTechlive Zheng <redacted>
Fri, 13 Nov 2015 02:32:33 +0000 (20:32 -0600)
committerJeff King <redacted>
Fri, 13 Nov 2015 05:02:56 +0000 (00:02 -0500)
commit4f96fcc9a2a2d756c5523c49a57f97b53c9cadb6
tree87ee90beae8f2f3a721e3e28d0dae6069155941ftree | snapshot
parentc9924996c95cfcc7633448e7ee8b88f440ccbd2bcommit | diff
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 <redacted>
Signed-off-by: David A. Greene <redacted>
Signed-off-by: Jeff King <redacted>
contrib/subtree/t/t7900-subtree.sh diff | blob | history
git clone https://git.99rst.org/PROJECT