Merge branch 'ml/rebase-x-strategy'
commit06d11b2e8d9d78d01212024f0f410e4193cbb5bd
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 19:29:47 +0000 (18 12:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 19:29:47 +0000 (18 12:29 -0700)
treeb0deab7259afb582a269aadce0547a5f9ee18b44
parent226d06c16bcafda3417163437be9845130fd4998
parent93ce190cd16b4c5ff16cc000eb75bd6e6c3238ac
Merge branch 'ml/rebase-x-strategy'

* ml/rebase-x-strategy:
  rebase: support -X to pass through strategy options
git-rebase.sh