Merge branch 'jc/maint-combine-diff-pre-context'

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

diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt
index a46bf6ce703f4bcf8b5f8066a7d7d2c3f21b4ec2..5428111d732cb38dbb257ddfa860ebd04088b4e9 100644 (file)
--- a/Documentation/blame-options.txt
+++ b/Documentation/blame-options.txt
@@ -39,9 +39,10 @@ of lines before or after the line given by <start>.
        Show raw timestamp (Default: off).
 
 -S <revs-file>::
        Show raw timestamp (Default: off).
 
 -S <revs-file>::

-       Use revs from revs-file instead of calling gitlink:git-rev-list[1].
+       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 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
        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>|::


@@ -64,11 +65,11 @@ of lines before or after the line given by <start>.
        assigns blame to the lines that were moved down (i.e. A)
        to the child commit.  With this option, both groups of lines
        are blamed on the parent.
        assigns blame to the lines that were moved down (i.e. A)
        to the child commit.  With this option, both groups of lines
        are blamed on the parent.

-
-       <num> is optional but it is the lower bound on the number of
-       alphanumeric characters that git must detect as moving
-       within a file for it to associate those lines with the parent
-       commit.
++
+<num> is optional but it is the lower bound on the number of
+alphanumeric characters that git must detect as moving
+within a file for it to associate those lines with the parent
+commit.

 
 -C|<num>|::
        In addition to `-M`, detect lines copied from other
 
 -C|<num>|::
        In addition to `-M`, detect lines copied from other


@@ -77,11 +78,12 @@ of lines before or after the line given by <start>.
        around across files.  When this option is given twice,
        the command looks for copies from all other files in the
        parent for the commit that creates the file in addition.
        around across files.  When this option is given twice,
        the command looks for copies from all other files in the
        parent for the commit that creates the file in addition.

++
+<num> is optional but it is the lower bound on the number of
+alphanumeric characters that git must detect as moving
+between files for it to associate those lines with the parent
+commit.

 
 

-       <num> is optional but it is the lower bound on the number of
-       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.
        Show help message.