Merge branch 'maint-1.6.0' into maint-1.6.1

Junio C Hamano committed over 17 years ago

Change test.sh to test the new add, merge, and pull commands.

Avery Pennarun committed over 17 years ago

Handle it successfully if a given parent commit has no parents.

Avery Pennarun committed over 17 years ago

Add 'git subtree merge' and 'git subtree pull'.

Avery Pennarun committed over 17 years ago

Add a new 'git subtree add' command for adding subtrees from a given rev.

Avery Pennarun committed over 17 years ago

Pass the path using the --prefix option instead of on the command line.

Avery Pennarun committed over 17 years ago

Okay, that was a little too aggressive.

Avery Pennarun committed over 17 years ago

Even more aggressive commit trimming.

Avery Pennarun committed over 17 years ago

Prune out some extra merge commits by comparing their parents correctly.

Avery Pennarun committed over 17 years ago

Quick test script for generating reasonably complex merge scenarios.

Avery Pennarun committed over 17 years ago

Skip over empty commits.

Avery Pennarun committed over 17 years ago

Hmm... can't actually filter rev-list on the subdir name.

Avery Pennarun committed over 17 years ago

Added a --onto option, but it's so complicated I can't tell if it works.

Avery Pennarun committed over 17 years ago

Use information about prior splits to make sure merges work right.

Avery Pennarun committed over 17 years ago

Add a new --rejoin option.

Avery Pennarun committed over 17 years ago

Print out the newly created commitid at the end, for use in other scripts.

Avery Pennarun committed over 17 years ago

We now copy the other stuff about a commit (changelog, author, etc).

Avery Pennarun committed over 17 years ago

'git subtree split' now basically works.

Avery Pennarun committed over 17 years ago

basic options parsing and whatnot.

Avery Pennarun committed over 17 years ago

t7800: respect NO_PERL

Jeff King committed over 17 years ago