![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Avery Pennarun <apenwarr@gmail.com> | |
| Sat, 30 May 2009 07:18:27 +0000 (03:18 -0400) | ||
| committer | Avery Pennarun <apenwarr@gmail.com> | |
| Sat, 30 May 2009 07:18:27 +0000 (03:18 -0400) | ||
| commit | 1cc2cfff91c61bb56236914da7be7b15584951df | |
| tree | 77ecfefdbc8a8d95f3bbff44559fb1a23b8d5041 | tree | snapshot |
| parent | 7ee9eef340170da6d13b9a0ab5a8d23950523b0d | commit | diff |
Basic "subtree merge --squash" support.
Instead of merging in the history of the entire subproject, just squash it
all into one commit, but try to at least track which commits we used so that
we can do future merges correctly.
Bonus feature: we can actually switch branches of the subproject this way,
just by "squash merging" back and forth from one tag to another.
Instead of merging in the history of the entire subproject, just squash it
all into one commit, but try to at least track which commits we used so that
we can do future merges correctly.
Bonus feature: we can actually switch branches of the subproject this way,
just by "squash merging" back and forth from one tag to another.
| git-subtree.sh | diff | blob | history |