diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-11-29 17:52:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-29 17:52:32 -0800 |
| commit | 4ef927a995d9b54b37e4cff8ed7cd92764d4dacd (patch) | |
| tree | 72ae07b6893c4d81b899b757f413be7534565706 /Documentation/git-blame.txt | |
| parent | Merge branch 'cm/diff-check-at-eol' (diff) | |
| parent | blame: Add option to show author email instead of name (diff) | |
| download | git-4ef927a995d9b54b37e4cff8ed7cd92764d4dacd.tar.gz git-4ef927a995d9b54b37e4cff8ed7cd92764d4dacd.zip | |
Merge branch 'kb/blame-author-email'
* kb/blame-author-email:
blame: Add option to show author email instead of name
Conflicts:
t/annotate-tests.sh
Diffstat (limited to 'Documentation/git-blame.txt')
| -rw-r--r-- | Documentation/git-blame.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt index a27f43950f..c71671b4f9 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] [-l] [--root] [-t] [-f] [-n] [-s] [-p] [-w] [--incremental] [-L n,m] +'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-e] [-p] [-w] [--incremental] [-L n,m] [-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<date>] [<rev> | --contents <file> | --reverse <rev>] [--] <file> @@ -65,6 +65,10 @@ include::blame-options.txt[] -s:: Suppress the author name and timestamp from the output. +-e:: +--show-email:: + Show the author email instead of author name (Default: off). + -w:: Ignore whitespace when comparing the parent's version and the child's to find where the lines came from. |