diff options
author | Junio C Hamano <junio@kernel.org> | 2010-08-18 22:15:35 +0000 |
---|---|---|
committer | Junio C Hamano <junio@kernel.org> | 2010-08-18 22:15:35 +0000 |
commit | 619596afe5769620cfbaca941f701a3fa106e6e5 (patch) | |
tree | a0065a9102205adf638a7ff9e35bb50ce049dcd0 /git-rebase.txt | |
parent | b5a296fa6d8cd1a703ce2eb6232e0bbc654bd2a2 (diff) | |
download | git-htmldocs-619596afe5769620cfbaca941f701a3fa106e6e5.tar.gz |
Autogenerated HTML docs for v1.7.2.1-158-gbd3a97
Diffstat (limited to 'git-rebase.txt')
-rw-r--r-- | git-rebase.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index be23ad235..b4314568f 100644 --- a/git-rebase.txt +++ b/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. |