diff options
author | Junio C Hamano <gitster@pobox.com> | 2007-06-13 00:22:40 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-06-13 00:22:40 -0700 |
commit | 90ac368afd75c9a53c6d953a693380369a41f8db (patch) | |
tree | bf2bb2ea78821245fde165cc2a7098efe90cda38 /Documentation | |
parent | refactor dir_add_name (diff) | |
parent | git-blame -w: ignore whitespace (diff) | |
download | tgif-90ac368afd75c9a53c6d953a693380369a41f8db.tar.xz |
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.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt index 44678b0c36..66f1203701 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 -------------------- |