Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
diff: add --detect-copies-harder as a synonym for --find-copies-harder
[gitweb.git]
/
git-rebase.sh
diff --git
a/git-rebase.sh
b/git-rebase.sh
index e5df23bb8350d6d155bdf1ac9a5be4c9fdc29326..10a238ae3cc942bc021db18195b7098e2866c266 100755
(executable)
--- a/
git-rebase.sh
+++ b/
git-rebase.sh
@@
-311,10
+311,6
@@
do
esac
strategy_opts="$strategy_opts $(git rev-parse --sq-quote "--$newopt")"
do_merge=t
- if test -n "$strategy"
- then
- strategy=recursive
- fi
;;
-s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\
--strateg=*|--strategy=*|\