summaryrefslogtreecommitdiff
path: root/git-subtree.sh
diff options
context:
space:
mode:
Diffstat (limited to 'git-subtree.sh')
-rwxr-xr-xgit-subtree.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/git-subtree.sh b/git-subtree.sh
index cccc3400fd..8baa376fe5 100755
--- a/git-subtree.sh
+++ b/git-subtree.sh
@@ -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" "$@"