mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-12-01 05:54:16 +08:00
Code Issues Packages Projects Releases Wiki Activity
4f96fcc9a2
git/contrib/subtree
History
Techlive Zheng 4f96fcc9a2 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>
2015-11-13 00:02:56 -05:00
..
t contrib/subtree: Add merge tests 2015-11-13 00:02:56 -05:00
.gitignore subtree: add an install-html target 2014-10-15 15:17:08 -07:00
COPYING Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb5230361c64946232cc346' 2012-04-09 20:22:55 -05:00
git-subtree.sh contrib/subtree: respect spaces in a repository path 2015-09-08 11:09:13 -07:00
git-subtree.txt contrib/subtree: there's no push --squash 2015-05-07 11:03:32 -07:00
INSTALL Fix git-subtree install instructions 2012-04-09 22:26:19 -05:00
Makefile subtree: add an install-html target 2014-10-15 15:17:08 -07:00
README Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb5230361c64946232cc346' 2012-04-09 20:22:55 -05:00
todo Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb5230361c64946232cc346' 2012-04-09 20:22:55 -05:00

README 

Please read git-subtree.txt for documentation.

Please don't contact me using github mail; it's slow, ugly, and worst of
all, redundant. Email me instead at apenwarr@gmail.com and I'll be happy to
help.

Avery