| commit | 448e71e2637e0d7546fb0a2b386e74bc7aa93be8 | |
| author | Pelle Wessman <pelle@kodfabrik.se> | |
| Fri, 7 May 2010 19:21:25 +0000 (7 21:21 +0200) | ||
| committer | Avery Pennarun <apenwarr@gmail.com> | |
| Fri, 7 May 2010 19:59:56 +0000 (7 15:59 -0400) | ||
| tree | e21402bf298cd2a9084fdbe52c78150595bc6f2c | treesnapshot (tar.gz zip) |
| parent | c00d1d11688dc02f066196ed18783effdb7767ab | commitdiff |
Use 'git merge -Xsubtree' when git version >= 1.7.0.
It's possible to specify the subdir of a subtree since Git 1.7.0 - adding
support for that functionality to make the merge more stable.
Also checking for git version - now only uses the new subtree subdir option
when on at least 1.7.
It's possible to specify the subdir of a subtree since Git 1.7.0 - adding
support for that functionality to make the merge more stable.
Also checking for git version - now only uses the new subtree subdir option
when on at least 1.7.
| git-subtree.sh | diffblobblamehistory |