global/git

mirror of https://github.com/git/git.git synced 2026-03-30 03:20:07 +02:00

Go to file

Avery Pennarun e31d1e2f30 cmd_pull didn't support --squash correctly.

We should implement it as
	git fetch ...
	git subtree merge ...

But we were instead just calling
	git pull -s subtree ...

because 'git subtree merge' used to be just an alias for 'git merge -s
subtree', but it no longer is.

2009-10-02 18:23:54 -04:00

.gitignore

Add basic git-subtree manpage in asciidoc format.

2009-05-30 14:06:58 -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

cmd_pull didn't support --squash correctly.

2009-10-02 18:23:54 -04:00

git-subtree.txt

Docs: when pushing to github, the repo path needs to end in .git

2009-07-08 20:17:31 -04:00

Makefile

Add basic git-subtree manpage in asciidoc format.

2009-05-30 14:06:58 -04: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

README

Add a README that says to email me instead of using github mail.

2009-10-02 11:51:25 -04:00

shellopts.sh

basic options parsing and whatnot.

2009-04-24 14:13:34 -04:00

test.sh

If someone provides a --prefix that ends with slash, strip the slash.

2009-10-02 16:08:58 -04: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

Languages

C 50.4%

Shell 38.8%

Perl 4.4%

Tcl 3.1%

Python 0.8%

Other 2.3%