Merge branch 'ml/rebase-x-strategy'
authorJunio C Hamano <redacted>
Wed, 18 Aug 2010 19:29:47 +0000 (12:29 -0700)
committerJunio C Hamano <redacted>
Wed, 18 Aug 2010 19:29:47 +0000 (12:29 -0700)
* ml/rebase-x-strategy:
  rebase: support -X to pass through strategy options

1  2 
git-rebase.sh

diff --cc git-rebase.sh
Simple merge
git clone https://git.99rst.org/PROJECT