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 /Documentation | |
| 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 'Documentation')
| -rw-r--r-- | Documentation/git-rebase.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index be23ad2359..b4314568f5 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -250,6 +250,13 @@ on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply discards all patches from the <branch>, which makes little sense. +-X <strategy-option>:: +--strategy-option=<strategy-option>:: + Pass the <strategy-option> through to the merge strategy. + This implies `\--merge` and, if no strategy has been + specified, `-s recursive`. Note the reversal of 'ours' and + 'theirs' as noted in above for the `-m` option. + -q:: --quiet:: Be quiet. Implies --no-stat. |