Merge branch 'jc/maint-smart-http-race-upload-pack' into maint

diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt
index ee4559b6f20d6cfe399c2b7e1b8dd9a1e2aafc7a..a8e77b5350c8c6a3cf62c22f811974ea64cff8ae 100644 (file)
--- a/Documentation/git-show-branch.txt
+++ b/Documentation/git-show-branch.txt
@@ -13,7 +13,6 @@ SYNOPSIS
                [--more=<n> | --list | --independent | --merge-base]
                [--no-name | --sha1-name] [--topics]
                [(<rev> | <glob>)...]
-
 'git show-branch' (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]
 
 DESCRIPTION