diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-05-21 16:27:43 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-05-21 16:27:43 +0000 |
| commit | 52d5def48c07bc4d01ba4beadf533864af3b0b94 (patch) | |
| tree | e94a0f01b65599eb08a41c9929fcc569d1187125 /git-rebase.txt | |
| parent | 52ba29509db8c14bdbb5011efe06ee34324786f9 (diff) | |
| download | git-htmldocs-52d5def48c07bc4d01ba4beadf533864af3b0b94.tar.gz | |
Autogenerated HTML docs for v1.6.3.1-70-ga80aa
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index 3d5a066c3..26f3b7b2b 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -231,8 +231,7 @@ OPTIONS -s <strategy>:: --strategy=<strategy>:: - Use the given merge strategy; can be supplied more than - once to specify them in the order they should be tried. + Use the given merge strategy. If there is no `-s` option, a built-in list of strategies is used instead ('git-merge-recursive' when merging a single head, 'git-merge-octopus' otherwise). This implies --merge. |