summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2006-12-28 07:35:11 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-28 09:08:06 (GMT)
commit6b5a795bf586aa019bbb11ffe9f2fc315ba9765e (patch)
tree9a2ce7462d6cbade246358a6695d8e4f116121fd /git-pull.sh
parentde811948baa689382ad191c1c95e8be51a92c4fe (diff)
downloadgit-6b5a795bf586aa019bbb11ffe9f2fc315ba9765e.zip
git-6b5a795bf586aa019bbb11ffe9f2fc315ba9765e.tar.gz
git-6b5a795bf586aa019bbb11ffe9f2fc315ba9765e.tar.bz2
Allow git-merge to select the default strategy.
Now that git-merge knows how to use the pull.{twohead,octopus} configuration options to select the default merge strategy there is no reason for git-pull to do the same immediately prior to invoking git-merge. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-pull.sh')
-rwxr-xr-xgit-pull.sh18
1 files changed, 0 insertions, 18 deletions
diff --git a/git-pull.sh b/git-pull.sh
index 2725946..28d0819 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -90,18 +90,6 @@ case "$merge_head" in
echo >&2 "Cannot merge multiple branches into empty head"
exit 1
fi
- var=`git-repo-config --get pull.octopus`
- if test -n "$var"
- then
- strategy_default_args="-s $var"
- fi
- ;;
-*)
- var=`git-repo-config --get pull.twohead`
- if test -n "$var"
- then
- strategy_default_args="-s $var"
- fi
;;
esac
@@ -112,12 +100,6 @@ then
exit
fi
-case "$strategy_args" in
-'')
- strategy_args=$strategy_default_args
- ;;
-esac
-
merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") || exit
exec git-merge $no_summary $no_commit $squash $strategy_args \
"$merge_name" HEAD $merge_head