summaryrefslogtreecommitdiff
path: root/Documentation/git-rebase.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-07-23 20:55:21 -0700
committerJunio C Hamano <gitster@pobox.com>2012-07-23 20:55:22 -0700
commit90683976ce83089284ebec3c93aa23d9eb9128a0 (patch)
treeb16f2a32bc9e264efdf98b2b9536404d9682b8ac /Documentation/git-rebase.txt
parent30ea575876f61c38c59cd578afd8e8789857094b (diff)
parentedfbbf7eead3001f8c4273220d043890421d7b73 (diff)
downloadgit-90683976ce83089284ebec3c93aa23d9eb9128a0.tar.gz
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.txt2
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::