Merge branch 'jc/combine' into next

diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index 1662e0656128829bbbefe2c07ab5d6cc7372f052..8b95df0c6e2a147cd89fdb20605896852085cbc5 100644 (file)
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -3,7 +3,7 @@ git-rev-parse(1)
 
 NAME
 ----
-git-rev-parse - Pick out and massage parameters.
+git-rev-parse - Pick out and massage parameters
 
 
 SYNOPSIS
@@ -80,7 +80,7 @@ OPTIONS
 --git-dir::
        Show `$GIT_DIR` if defined else show the path to the .git directory.
 
---short, short=number::
+--short, --short=number::
        Instead of outputting the full SHA1 values of object names try to
        abbriviate them to a shorter unique name. When no length is specified
        7 is used. The minimum length is 4.