summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Avery Pennarun [Sat, 25 Apr 2009 04:07:04 +0000 (00:07 -0400)]
Change test.sh to test the new add, merge, and pull commands.
Avery Pennarun [Sat, 25 Apr 2009 04:06:45 +0000 (00:06 -0400)]
Handle it successfully if a given parent commit has no parents.
Avery Pennarun [Sat, 25 Apr 2009 03:41:19 +0000 (23:41 -0400)]
Add 'git subtree merge' and 'git subtree pull'.
These are simple shortcuts for 'git merge -s subtree' and 'git pull -s
subtree', but it makes sense to have it all in one command.
Avery Pennarun [Sat, 25 Apr 2009 03:28:30 +0000 (23:28 -0400)]
Add a new 'git subtree add' command for adding subtrees from a given rev.
Avery Pennarun [Sat, 25 Apr 2009 02:57:14 +0000 (22:57 -0400)]
Pass the path using the --prefix option instead of on the command line.
I like this better. It's more like git-read-tree and some other commands.
Avery Pennarun [Sat, 25 Apr 2009 02:36:06 +0000 (22:36 -0400)]
Okay, that was a little too aggressive.
Now we only prune out a commit if it has exactly one remaining parent and
that parent's tree is identical to ours.
But I also changed the test to create the initial "-s ours" merge in one
step instead of two, and that merge can be eliminated since one of its
parents doesn't affect the subdir at all, and is thus deleted.
Avery Pennarun [Sat, 25 Apr 2009 02:05:30 +0000 (22:05 -0400)]
Even more aggressive commit trimming.
Now we cut out a commit if any of its parents had the same tree; just use
that parent in its place. This makes the history look nice, but I don't
think it's quite right...
Avery Pennarun [Sat, 25 Apr 2009 01:49:19 +0000 (21:49 -0400)]
Prune out some extra merge commits by comparing their parents correctly.
Avery Pennarun [Sat, 25 Apr 2009 01:35:50 +0000 (21:35 -0400)]
Quick test script for generating reasonably complex merge scenarios.
Avery Pennarun [Fri, 24 Apr 2009 21:53:10 +0000 (17:53 -0400)]
Skip over empty commits.
But we still need to get rid of unnecessary merge commits somehow...
Avery Pennarun [Fri, 24 Apr 2009 21:42:33 +0000 (17:42 -0400)]
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.
Avery Pennarun [Fri, 24 Apr 2009 21:05:14 +0000 (17:05 -0400)]
Added a --onto option, but it's so complicated I can't tell if it works.
Avery Pennarun [Fri, 24 Apr 2009 20:48:08 +0000 (16:48 -0400)]
Use information about prior splits to make sure merges work right.
Avery Pennarun [Fri, 24 Apr 2009 19:48:41 +0000 (15:48 -0400)]
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.
Avery Pennarun [Fri, 24 Apr 2009 18:52:27 +0000 (14:52 -0400)]
Print out the newly created commitid at the end, for use in other scripts.
Avery Pennarun [Fri, 24 Apr 2009 18:45:02 +0000 (14:45 -0400)]
We now copy the other stuff about a commit (changelog, author, etc).
Avery Pennarun [Fri, 24 Apr 2009 18:24:38 +0000 (14:24 -0400)]
'git subtree split' now basically works.
Avery Pennarun [Fri, 24 Apr 2009 18:13:34 +0000 (14:13 -0400)]
basic options parsing and whatnot.