Merge branch 'st/levenshtein'

diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt
index c11bb7d36c39899d782f8c2d3f87b5a59178840a..1ab1b96cf9e4c72a7d4e2a8a1d5dd8f016ac9d79 100644 (file)
--- a/Documentation/blame-options.txt
+++ b/Documentation/blame-options.txt
@@ -41,13 +41,21 @@ 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::
        Show the result incrementally in a format designed for
        machine consumption.
 
+--encoding=<encoding>::
+       Specifies the encoding used to output author names
+       and commit summaries. Setting it to `none` makes blame
+       output unconverted data. For more information see the
+       discussion about encoding in the linkgit:git-log[1]
+       manual page.
+
 --contents <file>::
        When <rev> is not specified, the command annotates the
        changes starting backwards from the working tree copy.
@@ -83,5 +91,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.