Merge branch 'ks/maint-1.6.0-mailinfo-folded' into maint-1.6.1

diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 7d1eced7d22b8debf46908e39dd6b34b586effe5..ac6421178c1a62ca62fb335d9939ec36368c7e82 100644 (file)
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -9,7 +9,7 @@ git-push - Update remote refs along with associated objects
 SYNOPSIS
 --------
 [verse]
-'git push' [--all | --mirror] [--dry-run] [--tags] [--receive-pack=<git-receive-pack>]
+'git push' [--all | --mirror | --tags] [--dry-run] [--receive-pack=<git-receive-pack>]
           [--repo=<repository>] [-f | --force] [-v | --verbose]
           [<repository> <refspec>...]