merge-recur: Convert variable names to lower_case

[git.git] / git-merge.sh
diff --git a/git-merge.sh b/git-merge.sh

index b26ca147c084c963d03effd2462244635f10e1fa..9b681159dcd5e1e22886d101306e496528cb60a4 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -9,8 +9,13 @@ USAGE='[-n] [--no-commit] [--squash] [-s <strategy>]... <merge-message> <head> <
  LF='
  '
  
-all_strategies='recur recur octopus resolve stupid ours'
-default_twohead_strategies='recur'
+all_strategies='recursive recur octopus resolve stupid ours'
+case "${GIT_USE_RECUR_FOR_RECURSIVE}" in
+'')
+       default_twohead_strategies=recursive ;;
+?*)
+       default_twohead_strategies=recur ;;
+esac
  default_octopus_strategies='octopus'
  no_trivial_merge_strategies='ours'
  use_strategies=
@@ -110,6 +115,10 @@ do
                         strategy="$2"
                         shift ;;
                 esac
+               case "$strategy,${GIT_USE_RECUR_FOR_RECURSIVE}" in
+               recursive,?*)
+                       strategy=recur ;;
+               esac
                 case " $all_strategies " in
                 *" $strategy "*)
                         use_strategies="$use_strategies$strategy " ;;