Avery Pennarun
847e868167
Quick test script for generating reasonably complex merge scenarios.
2009-04-24 21:35:50 -04:00
Avery Pennarun
768d6d1005
Skip over empty commits.
...
But we still need to get rid of unnecessary merge commits somehow...
2009-04-24 17:53:10 -04:00
Avery Pennarun
2c71b7c46d
Hmm... can't actually filter rev-list on the subdir name.
...
Otherwise we can't keep track of parent relationships. Argh.
This change makes it "work", but we get a bunch of empty commits.
2009-04-24 17:42:33 -04:00
Avery Pennarun
33ff583ad7
Added a --onto option, but it's so complicated I can't tell if it works.
2009-04-24 17:05:14 -04:00
Avery Pennarun
8b4a77f2a1
Use information about prior splits to make sure merges work right.
2009-04-24 16:48:08 -04:00
Avery Pennarun
b77172f814
Add a new --rejoin option.
...
The idea is to join the new split branch back into this one, so future
splits can append themselves to the old split branch. We mark the split
branch's history in our merge commit, so we can pull it back out later.
2009-04-24 15:48:41 -04:00
Avery Pennarun
e25a6bf837
Print out the newly created commitid at the end, for use in other scripts.
2009-04-24 14:52:27 -04:00
Avery Pennarun
fd9500eef2
We now copy the other stuff about a commit (changelog, author, etc).
2009-04-24 14:45:02 -04:00
Avery Pennarun
2573354e9b
'git subtree split' now basically works.
2009-04-24 14:24:38 -04:00
Avery Pennarun
0ca71b3737
basic options parsing and whatnot.
2009-04-24 14:13:34 -04:00
