diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-18 12:29:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-18 12:29:47 -0700 |
| commit | 06d11b2e8d9d78d01212024f0f410e4193cbb5bd (patch) | |
| tree | b0deab7259afb582a269aadce0547a5f9ee18b44 /diffcore-pickaxe.c | |
| parent | 226d06c16bcafda3417163437be9845130fd4998 (diff) | |
| parent | 93ce190cd16b4c5ff16cc000eb75bd6e6c3238ac (diff) | |
| download | git-06d11b2e8d9d78d01212024f0f410e4193cbb5bd.tar.gz | |
Merge branch 'ml/rebase-x-strategy'
* ml/rebase-x-strategy:
rebase: support -X to pass through strategy options
Diffstat (limited to 'diffcore-pickaxe.c')
0 files changed, 0 insertions, 0 deletions