Merge branch 'maint-1.6.0' into maint-1.6.1

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

diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt
index 5428111d732cb38dbb257ddfa860ebd04088b4e9..7f28432254a81e4c39ce8ff204b4d6618050c5c6 100644 (file)
--- a/Documentation/blame-options.txt
+++ b/Documentation/blame-options.txt
@@ -41,6 +41,13 @@ 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].
 
+--reverse::
+       Walk history forward instead of backward. Instead of showing
+       the revision in which a line appeared, this shows the last
+       revision in which a line has existed. This requires a range of
+       revision like START..END where the path to blame exists in
+       START.
+
 -p::
 --porcelain::
        Show in a format designed for machine consumption.
@@ -49,6 +56,13 @@ of lines before or after the line given by <start>.
        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.