diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-24 05:55:21 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-24 05:55:22 +0200 |
| commit | 90683976ce83089284ebec3c93aa23d9eb9128a0 (patch) | |
| tree | b16f2a32bc9e264efdf98b2b9536404d9682b8ac /Documentation/git-rebase.txt | |
| parent | Merge branch 'tg/ce-namelen-field' (diff) | |
| parent | doc: A few minor copy edits. (diff) | |
| download | git-90683976ce83089284ebec3c93aa23d9eb9128a0.tar.xz git-90683976ce83089284ebec3c93aa23d9eb9128a0.zip | |
Merge branch 'sn/doc-typofix'
* sn/doc-typofix:
doc: A few minor copy edits.
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index b30ed352e5..fd535b06ab 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/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:: |