Code

git.git
15 years agoUse information about prior splits to make sure merges work right.
Avery Pennarun [Fri, 24 Apr 2009 20:48:08 +0000 (16:48 -0400)]
Use information about prior splits to make sure merges work right.

15 years agoAdd a new --rejoin option.
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.

15 years agoPrint out the newly created commitid at the end, for use in other scripts.
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.

15 years agoWe now copy the other stuff about a commit (changelog, author, etc).
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).

15 years ago'git subtree split' now basically works.
Avery Pennarun [Fri, 24 Apr 2009 18:24:38 +0000 (14:24 -0400)]
'git subtree split' now basically works.

15 years agobasic options parsing and whatnot.
Avery Pennarun [Fri, 24 Apr 2009 18:13:34 +0000 (14:13 -0400)]
basic options parsing and whatnot.