Merge branch 'mt/rebase-i-keep-empty-test'

diff --git a/Documentation/git-show-ref.txt b/Documentation/git-show-ref.txt
index ffd1b03a9c0ee583effe6200fbabd327e7ac60f6..2a6f89b235f10ea6d41047a2a42a133531ea3cab 100644 (file)
--- a/Documentation/git-show-ref.txt
+++ b/Documentation/git-show-ref.txt
@@ -89,7 +89,7 @@ OPTIONS
        Show references matching one or more patterns. Patterns are matched from
        the end of the full name, and only complete parts are matched, e.g.
        'master' matches 'refs/heads/master', 'refs/remotes/origin/master',
-       'refs/tags/jedi/master' but not 'refs/heads/mymaster' nor
+       'refs/tags/jedi/master' but not 'refs/heads/mymaster' or
        'refs/remotes/master/jedi'.
 
 OUTPUT