Merge branch 'sb/fetch'

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

index d049e164318a416941334b15699d52f87b00387f..49c46d55df3491460864b3afd751258ec8ec97c7 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -9,21 +9,15 @@ USAGE='[-n] [--no-commit] [--squash] [-s <strategy>]... <merge-message> <head> <
  LF='
  '
  
-all_strategies='recursive recur octopus resolve stupid ours'
-case "${GIT_USE_RECUR_FOR_RECURSIVE}" in
-'')
-       default_twohead_strategies=recursive ;;
-?*)
-       default_twohead_strategies=recur ;;
-esac
+all_strategies='recur recursive recursive-old octopus resolve stupid ours'
+default_twohead_strategies='recursive'
  default_octopus_strategies='octopus'
  no_trivial_merge_strategies='ours'
  use_strategies=
  
  index_merge=t
  if test "@@NO_PYTHON@@"; then
-       all_strategies='recur resolve octopus stupid ours'
-       default_twohead_strategies='resolve'
+       all_strategies='recur recursive resolve octopus stupid ours'
  fi
  
  dropsave() {
@@ -122,10 +116,6 @@ 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 " ;;
@@ -207,7 +197,7 @@ f,*)
         ;;
  ?,1,"$head",*)
         # Again the most common case of merging one remote.
-       echo "Updating from $head to $1"
+       echo "Updating $(git-rev-parse --short $head)..$(git-rev-parse --short $1)"
         git-update-index --refresh 2>/dev/null
         new_head=$(git-rev-parse --verify "$1^0") &&
         git-read-tree -u -v -m $head "$new_head" &&