@matheusbsbs / matheus-bagliano / commits / 6b5a795bf5
Fork 0

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>

Shawn O. Pearce committed Dec 28, 2006 at 02:35 UTC 6b5a795bf586aa019bbb11ffe9f2fc315ba9765e
1 file changed -18
git-pull.sh
-18
@@ -90,18 +90,6 @@ case "$merge_head" in
90 echo >&2 "Cannot merge multiple branches into empty head"
91 exit 1
92 fi
93 - var=`git-repo-config --get pull.octopus`
94 - if test -n "$var"
95 - then
96 - strategy_default_args="-s $var"
97 - fi
98 - ;;
99 -*)
100 - var=`git-repo-config --get pull.twohead`
101 - if test -n "$var"
102 - then
103 - strategy_default_args="-s $var"
104 - fi
93 ;;
94 esac
95
@@ -112,12 +100,6 @@ then
100 exit
101 fi
102
115 -case "$strategy_args" in
116 -'')
117 - strategy_args=$strategy_default_args
118 - ;;
119 -esac
120 -
103 merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") || exit
104 exec git-merge $no_summary $no_commit $squash $strategy_args \
105 "$merge_name" HEAD $merge_head