@@ -567,8 +567,9 @@ cmd_merge() cmd_pull() { ensure_clean - set -x - git pull -s subtree "$@" + git fetch "$@" || exit $? + revs=FETCH_HEAD + cmd_merge } "cmd_$command" "$@" git-subtree.sh 2275f7077d5ea2bb9201599dec0dd8f2a5de2e40 Avery Pennarun apenwarr@gmail.com http://github.com/apenwarr/git-subtree/commit/e31d1e2f30c943473de7a23bbbcd2dcea698e312 e31d1e2f30c943473de7a23bbbcd2dcea698e312 2009-10-02T15:23:54-07:00 2009-10-02T15:23:54-07:00 cmd_pull didn't support --squash correctly. We should implement it as git fetch ... git subtree merge ... But we were instead just calling git pull -s subtree ... because 'git subtree merge' used to be just an alias for 'git merge -s subtree', but it no longer is. 79d120ed537bcda8a151721d6503baf4c8c79c12 Avery Pennarun apenwarr@gmail.com