![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Avery Pennarun <apenwarr@gmail.com> | |
| Fri, 24 Apr 2009 19:48:41 +0000 (15:48 -0400) | ||
| committer | Avery Pennarun <apenwarr@gmail.com> | |
| Fri, 24 Apr 2009 19:48:41 +0000 (15:48 -0400) | ||
| commit | b77172f8140d830a9160306c8ee10ceed413ba23 | |
| tree | 27213bdbed8730218a25618e1657709edf48f723 | tree | snapshot |
| parent | e25a6bf837ba378b0a8264e580c61069951dce66 | commit | diff |
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.
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 | diff | blob | history |