Merge branch 'tr/send-email-ssl'

diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt
index ea1007bfb0e759a7b3704c8d44270023cb78dc6b..5428111d732cb38dbb257ddfa860ebd04088b4e9 100644 (file)
--- a/Documentation/blame-options.txt
+++ b/Documentation/blame-options.txt
@@ -41,7 +41,8 @@ of lines before or after the line given by <start>.
 -S <revs-file>::
        Use revs from revs-file instead of calling linkgit:git-rev-list[1].
 
--p, --porcelain::
+-p::
+--porcelain::
        Show in a format designed for machine consumption.
 
 --incremental::
@@ -52,7 +53,7 @@ of lines before or after the line given by <start>.
        When <rev> is not specified, the command annotates the
        changes starting backwards from the working tree copy.
        This flag makes the command pretend as if the working
-       tree copy has the contents of he named file (specify
+       tree copy has the contents of the named file (specify
        `-` to make the command read from the standard input).
 
 -M|<num>|::
@@ -83,5 +84,6 @@ alphanumeric characters that git must detect as moving
 between files for it to associate those lines with the parent
 commit.
 
--h, --help::
+-h::
+--help::
        Show help message.