kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'maint' 

* maint:
  rebase -X: do not clobber strategy
maint
Junio C Hamano 2010-11-15 11:00:24 -08:00
parent f8d186bba7 f772c34ce0
commit d6b634fafd
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-rebase.sh
View File

@ -311,10 +311,6 @@ do
esac esac
strategy_opts="$strategy_opts $(git rev-parse --sq-quote "--$newopt")" strategy_opts="$strategy_opts $(git rev-parse --sq-quote "--$newopt")"
do_merge=t do_merge=t
if test -n "$strategy"
then
strategy=recursive
fi
;; ;;
-s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\ -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\
--strateg=*|--strategy=*|\ --strateg=*|--strategy=*|\