Add a new --rejoin option.
commitb77172f8140d830a9160306c8ee10ceed413ba23
authorAvery Pennarun <apenwarr@gmail.com>
Fri, 24 Apr 2009 19:48:41 +0000 (24 15:48 -0400)
committerAvery Pennarun <apenwarr@gmail.com>
Fri, 24 Apr 2009 19:48:41 +0000 (24 15:48 -0400)
tree27213bdbed8730218a25618e1657709edf48f723
parente25a6bf837ba378b0a8264e580c61069951dce66
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.
git-subtree.sh