summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-09-25 02:49:47 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-09-25 03:33:35 (GMT)
commita06f678eb998862ea83b73e46ece32f99132935b (patch)
treed7604f01f42a87ffbb4bc6eb8ebe8b5dc9adf0b5 /git-merge.sh
parent8391548e5e78677eb81f97334d998418802ea194 (diff)
downloadgit-a06f678eb998862ea83b73e46ece32f99132935b.zip
git-a06f678eb998862ea83b73e46ece32f99132935b.tar.gz
git-a06f678eb998862ea83b73e46ece32f99132935b.tar.bz2
Deprecate merge-recursive.py
This renames merge-recursive written in Python to merge-recursive-old, and makes merge-recur as a synonym to merge-recursive. We do not remove merge-recur yet, but we will remove merge-recur and merge-recursive-old in a few releases down the road. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh16
1 files changed, 3 insertions, 13 deletions
diff --git a/git-merge.sh b/git-merge.sh
index d049e16..5b34b4d 100755
--- 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 " ;;