From: Shawn O. Pearce Date: Thu, 28 Dec 2006 07:35:05 GMT Subject: [PATCH 5/11] Honor pull.{twohead,octopus} in git-merge. Message-ID: <20061228073505.GE17867@spearce.org> In-Reply-To: <9847899e4ba836980dbfed6d0ea1c82f31f21456.1167290864.git.spearce@spearce.org> 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 --- git-merge.sh | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/git-merge.sh b/git-merge.sh index c7e033c..a8f673e 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -272,9 +272,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 -- 1.4.4.3.gd2e4