diff options
| author | Pelle Wessman <pelle@kodfabrik.se> | 2010-05-07 21:21:25 +0200 |
|---|---|---|
| committer | Avery Pennarun <apenwarr@gmail.com> | 2010-05-07 15:59:56 -0400 |
| commit | 448e71e2637e0d7546fb0a2b386e74bc7aa93be8 (patch) | |
| tree | e21402bf298cd2a9084fdbe52c78150595bc6f2c /contrib/persistent-https | |
| parent | Added new 'push' command and 2-parameter form of 'add'. (diff) | |
| download | git-448e71e2637e0d7546fb0a2b386e74bc7aa93be8.tar.gz git-448e71e2637e0d7546fb0a2b386e74bc7aa93be8.zip | |
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.
Diffstat (limited to 'contrib/persistent-https')
0 files changed, 0 insertions, 0 deletions