Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

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

diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt
index 0ee887d73c704fc877db845b6f5f7ab3b9b10363..5c9888d0143ec8e6c8f7c6782139cde38a25ff17 100644 (file)
--- a/Documentation/git-blame.txt
+++ b/Documentation/git-blame.txt
@@ -9,7 +9,7 @@ SYNOPSIS
 --------
 [verse]
 'git-blame' [-c] [-l] [-t] [-f] [-n] [-p] [--incremental] [-L n,m] [-S <revs-file>]
-            [-M] [-C] [-C] [--since=<date>] [<rev>] [--] <file>
+            [-M] [-C] [-C] [--since=<date>] [<rev> | --contents <file>] [--] <file>
 
 DESCRIPTION
 -----------
@@ -67,6 +67,13 @@ OPTIONS
        Show the result incrementally in a format designed for
        machine consumption.
 
+--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
+       `-` to make the command read from the standard input).
+
 -M::
        Detect moving lines in the file as well.  When a commit
        moves a block of lines in a file (e.g. the original file