summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-06-13 07:22:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-06-13 07:22:40 (GMT)
commit90ac368afd75c9a53c6d953a693380369a41f8db (patch)
treebf2bb2ea78821245fde165cc2a7098efe90cda38 /Documentation
parent6815e56933f5bb03d6af1eb2d2b356356cf7bf8e (diff)
parentb82871b3c32faa8a317007f343fdf2d0ddc9954e (diff)
downloadgit-90ac368afd75c9a53c6d953a693380369a41f8db.zip
git-90ac368afd75c9a53c6d953a693380369a41f8db.tar.gz
git-90ac368afd75c9a53c6d953a693380369a41f8db.tar.bz2
Merge branch 'jc/blame' (early part)
* 'jc/blame' (early part): git-blame -w: ignore whitespace git-blame: do not indent with spaces.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-blame.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt
index 44678b0..66f1203 100644
--- 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] [-b] [--root] [-s] [-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>
@@ -63,6 +63,11 @@ include::blame-options.txt[]
-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
--------------------