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>

diff --git a/git-pull.sh b/git-pull.sh
index 27259464ff3461c08ff77942a81e9b03eff094ec..28d08195f0c84b7f3a89a5c5cff9945bb64ddfb3 100755 (executable)
--- 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
                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
 
        ;;
 esac
 


@@ -112,12 +100,6 @@ then
        exit
 fi
 
        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
 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