diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-23 21:35:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-23 21:35:38 -0700 |
| commit | 44dcd493a7896aabe2b48b0a2935633538d81f7c (patch) | |
| tree | 55fb9bfad3faa4309b5e1c0781f78d635c6dbd3b /git-rebase.txt | |
| parent | bb300643ea913f58d836780e949b1ebcce8da530 (diff) | |
| download | git-htmldocs-44dcd493a7896aabe2b48b0a2935633538d81f7c.tar.gz | |
Autogenerated HTML docs for v1.7.12-rc0
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index b30ed352e..fd535b06a 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -273,7 +273,7 @@ which makes little sense. 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. + 'theirs' as noted above for the `-m` option. -q:: --quiet:: |