Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'maint'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 15 Nov 2010 19:00:24 +0000
(11:00 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 15 Nov 2010 19:00:24 +0000
(11:00 -0800)
* maint:
rebase -X: do not clobber strategy
git-rebase.sh
patch
|
blob
|
history
raw
(from parent 1:
f8d186b
)
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=*|\