diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2009-05-21 19:47:07 +1000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-21 07:33:23 -0700 |
| commit | 06f391906a69e410c9a6ca5e13774529a091385d (patch) | |
| tree | 55925fdf3f5cb83b51c10d550c2cd790a217a432 /Documentation/git-rebase.txt | |
| parent | 581412cb02cc79c566c9828a9cfbe7847b2c6df2 (diff) | |
| download | git-06f391906a69e410c9a6ca5e13774529a091385d.tar.gz | |
doc/git-rebase.txt: remove mention of multiple strategies
git-rebase.sh does not seem to support this.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 3d5a066c31..26f3b7b2b0 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/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. |