Merge branch 'sb/fetch'

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

index a9cfafb1dfba6e85834a33caf6b3c69910594bf6..49c46d55df3491460864b3afd751258ec8ec97c7 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -9,7 +9,7 @@ USAGE='[-n] [--no-commit] [--squash] [-s <strategy>]... <merge-message> <head> <
  LF='
  '
  
-all_strategies='recursive octopus resolve stupid ours'
+all_strategies='recur recursive recursive-old octopus resolve stupid ours'
  default_twohead_strategies='recursive'
  default_octopus_strategies='octopus'
  no_trivial_merge_strategies='ours'
@@ -17,8 +17,7 @@ use_strategies=
  
  index_merge=t
  if test "@@NO_PYTHON@@"; then
-       all_strategies='resolve octopus stupid ours'
-       default_twohead_strategies='resolve'
+       all_strategies='recur recursive resolve octopus stupid ours'
  fi
  
  dropsave() {
@@ -198,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" &&