From: Shawn O. Pearce <spearce@spearce.org>
Date: Thu, 28 Dec 2006 07:35:05 +0000 (-0500)
Subject: Honor pull.{twohead,octopus} in git-merge.
X-Git-Tag: v1.5.0-rc1~174
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=de811948baa689382ad191c1c95e8be51a92c4fe;p=git.git

Honor pull.{twohead,octopus} in git-merge.

If git-merge is invoked without a strategy argument it is probably
being run as a porcelain-ish command directly and is not being run
from within git-pull.  However we still should honor whatever merge
strategy the user may have selected in their configuration, just as
`git-pull .` would have.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-merge.sh b/git-merge.sh
index e8db52725..ba4226042 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -227,9 +227,21 @@ case "$use_strategies" in
 '')
 	case "$#" in
 	1)
-		use_strategies="$default_twohead_strategies" ;;
+		var="`git-repo-config --get pull.twohead`"
+		if test -n "$var"
+		then
+			use_strategies="$var"
+		else
+			use_strategies="$default_twohead_strategies"
+		fi ;;
 	*)
-		use_strategies="$default_octopus_strategies" ;;
+		var="`git-repo-config --get pull.octopus`"
+		if test -n "$var"
+		then
+			use_strategies="$var"
+		else
+			use_strategies="$default_octopus_strategies"
+		fi ;;
 	esac
 	;;
 esac