[PATCH 6/11] Allow git-merge to select the default strategy.
From: Shawn O. Pearce <hidden>
Date: 2016-06-15 22:42:47
Subsystem:
the rest · Maintainer:
Linus Torvalds
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 <redacted>
---
git-pull.sh | 18 ------------------
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
--
1.4.4.3.gd2e4