Merge master into aw/mirror-push

diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt
index 8f9439a6ddfa505c0f3cd0d1f0ba826fc12cc1ba..66f1203701350f42cb028c6971c169ac129332ec 100644 (file)
--- a/Documentation/git-blame.txt
+++ b/Documentation/git-blame.txt
@@ -8,7 +8,7 @@ git-blame - Show what revision and author last modified each line of a file
 SYNOPSIS
 --------
 [verse]
-'git-blame' [-c] [-l] [-t] [-f] [-n] [-p] [--incremental] [-L n,m]
+'git-blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-p] [-w] [--incremental] [-L n,m]
             [-S <revs-file>] [-M] [-C] [-C] [--since=<date>]
             [<rev> | --contents <file>] [--] <file>
 
@@ -60,6 +60,14 @@ include::blame-options.txt[]
 -n, --show-number::
        Show line number in the original commit (Default: off).
 
+-s::
+       Suppress author name and timestamp from the output.
+
+-w::
+       Ignore whitespace when comparing parent's version and
+       child's to find where the lines came from.
+
+
 THE PORCELAIN FORMAT
 --------------------