Merge branch 'mv/remote-rename'

[git.git] / Documentation / blame-options.txt

diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt
index ea1007bfb0e759a7b3704c8d44270023cb78dc6b..1ab1b96cf9e4c72a7d4e2a8a1d5dd8f016ac9d79 100644 (file)
--- a/Documentation/blame-options.txt
+++ b/Documentation/blame-options.txt
@@ -41,18 +41,26 @@ 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].
 
 -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.
 
        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.
        This flag makes the command pretend as if the working
 --contents <file>::
        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>|::
        `-` to make the command read from the standard input).
 
 -M|<num>|::


@@ -83,5 +91,6 @@ alphanumeric characters that git must detect as moving
 between files for it to associate those lines with the parent
 commit.
 
 between files for it to associate those lines with the parent
 commit.
 

--h, --help::
+-h::
+--help::

        Show help message.
        Show help message.