From: Junio C Hamano Date: Wed, 18 Aug 2010 19:29:47 +0000 (-0700) Subject: Merge branch 'ml/rebase-x-strategy' X-Git-Tag: v1.7.3-rc0~67 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=06d11b2e8d9d78d01212024f0f410e4193cbb5bd;p=git.git Merge branch 'ml/rebase-x-strategy' * ml/rebase-x-strategy: rebase: support -X to pass through strategy options --- 06d11b2e8d9d78d01212024f0f410e4193cbb5bd