Merge branch 'jk/skip-prefix'

diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt
index a515648ab018b849897dd3506183f57359be598a..b91d4e545b07e21931ac44a04cffea8824c8c7a2 100644 (file)
--- a/Documentation/git-show-branch.txt
+++ b/Documentation/git-show-branch.txt
@@ -25,7 +25,7 @@ and/or refs/tags) semi-visually.
 It cannot show more than 29 branches and commits at a time.
 
 It uses `showbranch.default` multi-valued configuration items if
-no <rev> nor <glob> is given on the command line.
+no <rev> or <glob> is given on the command line.
 
 
 OPTIONS