Merge branch 'jn/block-sha1'

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index b30ed352e5a3f87d24119624966c33b4c194df5a..fd535b06abf85ae166413ad0d24226240f8dd066 100644 (file)
--- 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::