Avery Pennarun 1cc2cfff91 Basic "subtree merge --squash" support. ...

Instead of merging in the history of the entire subproject, just squash it
all into one commit, but try to at least track which commits we used so that
we can do future merges correctly.

Bonus feature: we can actually switch branches of the subproject this way,
just by "squash merging" back and forth from one tag to another.

2009-05-30 03:18:27 -04:00

.gitignore

basic options parsing and whatnot.

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

git-subtree

basic options parsing and whatnot.

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

git-subtree.sh

Basic "subtree merge --squash" support.

2009-05-30 03:18:27 -04:00

shellopts.sh

basic options parsing and whatnot.

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

test.sh

test.sh: oops, never intended to count the raw number of commits.

2009-04-26 18:05:49 -04:00

todo

New --branch option to split command.

2009-05-30 01:12:32 -04:00

Description

No description provided

638 MiB

Languages

C 50.4%

Shell 38.8%

Perl 4.4%

Tcl 3.1%

Python 0.8%

Other 2.3%