kernel/git - git - PowerEL Git System

Go to file

Pelle Wessman 448e71e263 Use 'git merge -Xsubtree' when git version >= 1.7.0. It's possible to specify the subdir of a subtree since Git 1.7.0 - adding support for that functionality to make the merge more stable. Also checking for git version - now only uses the new subtree subdir option when on at least 1.7.		2010-05-07 15:59:56 -04:00
.gitignore	added temporary test dirs to gitignore	2010-01-12 23:27:39 +01:00
COPYING	Oops, forgot a COPYING file. It's GPLv2.	2009-11-15 12:13:19 -05:00
INSTALL	Added new 'push' command and 2-parameter form of 'add'.	2010-02-13 14:45:04 -05:00
Makefile	Weird, I forgot to have 'make test' call test.sh.	2009-11-20 19:43:47 -05:00
README	Add a README that says to email me instead of using github mail.	2009-10-02 11:51:25 -04:00
asciidoc.conf	Add basic git-subtree manpage in asciidoc format.	2009-05-30 14:06:58 -04:00
git-subtree	basic options parsing and whatnot.	2009-04-24 14:13:34 -04:00
git-subtree.sh	Use 'git merge -Xsubtree' when git version >= 1.7.0.	2010-05-07 15:59:56 -04:00
git-subtree.txt	Added new 'push' command and 2-parameter form of 'add'.	2010-02-13 14:45:04 -05:00
install.sh	Added new 'push' command and 2-parameter form of 'add'.	2010-02-13 14:45:04 -05:00
manpage-base.xsl	Add basic git-subtree manpage in asciidoc format.	2009-05-30 14:06:58 -04:00
manpage-normal.xsl	Add basic git-subtree manpage in asciidoc format.	2009-05-30 14:06:58 -04:00
shellopts.sh	basic options parsing and whatnot.	2009-04-24 14:13:34 -04:00
test.sh	Some recent tests accidentally depended on very new versions of git.	2010-02-08 19:44:41 -05:00
todo	If someone provides a --prefix that ends with slash, strip the slash.	2009-10-02 16:08:58 -04: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