Merge branch 'jc/fix-tree-walk'

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

diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt
index 7f28432254a81e4c39ce8ff204b4d6618050c5c6..4833cac4b996e83e351b70d8f02a160d04e9a8e3 100644 (file)
--- a/Documentation/blame-options.txt
+++ b/Documentation/blame-options.txt
@@ -39,7 +39,7 @@ of lines before or after the line given by <start>.
        Show raw timestamp (Default: off).
 
 -S <revs-file>::
-       Use revs from revs-file instead of calling linkgit:git-rev-list[1].
+       Use revisions from revs-file instead of calling linkgit:git-rev-list[1].
 
 --reverse::
        Walk history forward instead of backward. Instead of showing
@@ -70,11 +70,19 @@ of lines before or after the line given by <start>.
        tree copy has the contents of the named file (specify
        `-` to make the command read from the standard input).
 
+--date <format>::
+       The value is one of the following alternatives:
+       {relative,local,default,iso,rfc,short}. If --date is not
+       provided, the value of the blame.date config variable is
+       used. If the blame.date config variable is also not set, the
+       iso format is used. For more information, See the discussion
+       of the --date option at linkgit:git-log[1].
+
 -M|<num>|::
        Detect moving lines in the file as well.  When a commit
        moves a block of lines in a file (e.g. the original file
        has A and then B, and the commit changes it to B and
-       then A), traditional 'blame' algorithm typically blames
+       then A), the traditional 'blame' algorithm typically blames
        the lines that were moved up (i.e. B) to the parent and
        assigns blame to the lines that were moved down (i.e. A)
        to the child commit.  With this option, both groups of lines
@@ -90,8 +98,10 @@ commit.
        files that were modified in the same commit.  This is
        useful when you reorganize your program and move code
        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.
+       the command additionally looks for copies from other
+       files in the commit that creates the file. When this
+       option is given three times, the command additionally
+       looks for copies from other files in any commit.
 +
 <num> is optional but it is the lower bound on the number of
 alphanumeric characters that git must detect as moving