Merge branch 'bg/maint-remote-update-default' into maint

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

diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt
index 26cfb6219591e982a360f3303889bd594e5d3293..4833cac4b996e83e351b70d8f02a160d04e9a8e3 100644 (file)
--- a/Documentation/blame-options.txt
+++ b/Documentation/blame-options.txt
@@ -70,6 +70,14 @@ 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
@@ -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 additionally looks for copies from all other
-       files in the parent for the commit that creates the file.
+       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