Merge remote branch 'origin/master'

* origin/master:
Fixed regression with splitting out new subtree
Use 'git merge -Xsubtree' when git version >= 1.7.0.

diff --git a/git-subtree.sh b/git-subtree.sh
index a86cfd8b9f8fd9a50e577f0612fea7a7a2b90213..a15d91ffb1b3d3318409619449745dbcfb393abf 100755 (executable)
--- a/git-subtree.sh
+++ b/git-subtree.sh
@@ -29,8 +29,12 @@ rejoin        merge the new branch back into HEAD
 squash        merge subtree changes as a single commit
 "
 eval $(echo "$OPTS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?)
+
+OPATH=$PATH
 PATH=$(git --exec-path):$PATH
 . git-sh-setup
+PATH=$OPATH  # apparently needed for some versions of msysgit
+
 require_work_tree
 
 quiet=