blob: 7ee923629ecc0dbf12a845f18d02c317b6266066 [file] [log] [blame]
Junio C Hamanob33fb4f2006-04-18 21:30:511git-blame(1)
2============
3
4NAME
5----
Junio C Hamano6b2cee12006-08-26 08:43:316git-blame - Show what revision and author last modified each line of a file
Junio C Hamanob33fb4f2006-04-18 21:30:517
8SYNOPSIS
9--------
Junio C Hamanoe1aa7472006-11-09 07:37:5010[verse]
Junio C Hamanoed69a742010-12-01 03:09:2311'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-e] [-p] [-w] [--incremental] [-L n,m]
Junio C Hamano209ebe82011-04-27 21:09:5912 [-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<date>] [--abbrev=<n>]
Junio C Hamanoa6455f62009-02-20 08:33:0813 [<rev> | --contents <file> | --reverse <rev>] [--] <file>
Junio C Hamanob33fb4f2006-04-18 21:30:5114
15DESCRIPTION
16-----------
Junio C Hamano6b2cee12006-08-26 08:43:3117
18Annotates each line in the given file with information from the revision which
19last modified the line. Optionally, start annotating from the given revision.
20
Junio C Hamanofd83b8e2009-03-22 08:21:4121The command can also limit the range of lines annotated.
Junio C Hamanoe1aa7472006-11-09 07:37:5022
Junio C Hamanofd83b8e2009-03-22 08:21:4123The report does not tell you anything about lines which have been deleted or
Junio C Hamano1aa40d22010-01-21 17:46:4324replaced; you need to use a tool such as 'git diff' or the "pickaxe"
Junio C Hamano6b2cee12006-08-26 08:43:3125interface briefly mentioned in the following paragraph.
26
27Apart from supporting file annotation, git also supports searching the
Junio C Hamanof9771f62007-01-17 17:42:3028development history for when a code snippet occurred in a change. This makes it
Junio C Hamano6b2cee12006-08-26 08:43:3129possible to track when a code snippet was added to a file, moved or copied
30between files, and eventually deleted or replaced. It works by searching for
31a text string in the diff. A small example:
32
33-----------------------------------------------------------------------------
34$ git log --pretty=oneline -S'blame_usage'
355040f17eba15504bad66b14a645bddd9b015ebb7 blame -S <ancestry-file>
36ea4c7f9bf69e781dd0cd88d2bccb2bf5cc15c9a7 git-blame: Make the output
37-----------------------------------------------------------------------------
Junio C Hamanob33fb4f2006-04-18 21:30:5138
39OPTIONS
40-------
Junio C Hamano0e3cb532007-04-17 08:28:1141include::blame-options.txt[]
42
43-c::
Junio C Hamano35738e82008-01-07 07:55:4644Use the same output mode as linkgit:git-annotate[1] (Default: off).
Junio C Hamanob33fb4f2006-04-18 21:30:5145
Junio C Hamano0e3cb532007-04-17 08:28:1146--score-debug::
47Include debugging information related to the movement of
48lines between files (see `-C`) and lines moved within a
49file (see `-M`). The first number listed is the score.
50This is the number of alphanumeric characters detected
Junio C Hamanofd83b8e2009-03-22 08:21:4151as having been moved between or within files. This must be above
Junio C Hamano1aa40d22010-01-21 17:46:4352a certain threshold for 'git blame' to consider those lines
Junio C Hamano0e3cb532007-04-17 08:28:1153of code to have been moved.
Junio C Hamanob33fb4f2006-04-18 21:30:5154
Junio C Hamanoeb415992008-06-08 22:49:4755-f::
56--show-name::
Junio C Hamanofd83b8e2009-03-22 08:21:4157Show the filename in the original commit. By default
58the filename is shown if there is any line that came from a
59file with a different name, due to rename detection.
Junio C Hamanoff4b4312006-10-25 22:55:3160
Junio C Hamanoeb415992008-06-08 22:49:4761-n::
62--show-number::
Junio C Hamanofd83b8e2009-03-22 08:21:4163Show the line number in the original commit (Default: off).
Junio C Hamanoff4b4312006-10-25 22:55:3164
Junio C Hamano469d60e2007-04-29 18:30:3465-s::
Junio C Hamanofd83b8e2009-03-22 08:21:4166Suppress the author name and timestamp from the output.
Junio C Hamano469d60e2007-04-29 18:30:3467
Junio C Hamanoed69a742010-12-01 03:09:2368-e::
69--show-email::
70Show the author email instead of author name (Default: off).
71
Junio C Hamano9e52d4e2007-06-13 08:29:3372-w::
Junio C Hamanofd83b8e2009-03-22 08:21:4173Ignore whitespace when comparing the parent's version and
74the child's to find where the lines came from.
Junio C Hamano9e52d4e2007-06-13 08:29:3375
Junio C Hamano209ebe82011-04-27 21:09:5976--abbrev=<n>::
77Instead of using the default 7+1 hexadecimal digits as the
78abbreviated object name, use <n>+1 digits. Note that 1 column
79is used for a caret to mark the boundary commit.
80
Junio C Hamano9e52d4e2007-06-13 08:29:3381
Junio C Hamanoff4b4312006-10-25 22:55:3182THE PORCELAIN FORMAT
83--------------------
84
85In this format, each line is output after a header; the
Junio C Hamanof9771f62007-01-17 17:42:3086header at the minimum has the first line which has:
Junio C Hamanoff4b4312006-10-25 22:55:3187
88- 40-byte SHA-1 of the commit the line is attributed to;
89- the line number of the line in the original file;
90- the line number of the line in the final file;
Junio C Hamanofd83b8e2009-03-22 08:21:4191- on a line that starts a group of lines from a different
Junio C Hamanoff4b4312006-10-25 22:55:3192 commit than the previous one, the number of lines in this
93 group. On subsequent lines this field is absent.
94
95This header line is followed by the following information
96at least once for each commit:
97
Junio C Hamanofd83b8e2009-03-22 08:21:4198- the author name ("author"), email ("author-mail"), time
Junio C Hamanoff4b4312006-10-25 22:55:3199 ("author-time"), and timezone ("author-tz"); similarly
100 for committer.
Junio C Hamanofd83b8e2009-03-22 08:21:41101- the filename in the commit that the line is attributed to.
Junio C Hamanoff4b4312006-10-25 22:55:31102- the first line of the commit log message ("summary").
103
104The contents of the actual line is output after the above
105header, prefixed by a TAB. This is to allow adding more
106header elements later.
107
Junio C Hamano2a294cd2011-05-23 23:06:31108The porcelain format generally suppresses commit information that has
109already been seen. For example, two lines that are blamed to the same
110commit will both be shown, but the details for that commit will be shown
111only once. This is more efficient, but may require more state be kept by
112the reader. The `--line-porcelain` option can be used to output full
113commit information for each line, allowing simpler (but less efficient)
114usage like:
115
116# count the number of lines attributed to each author
117git blame --line-porcelain file |
118sed -n 's/^author //p' |
119sort | uniq -c | sort -rn
120
Junio C Hamanoe1aa7472006-11-09 07:37:50121
Junio C Hamanof9771f62007-01-17 17:42:30122SPECIFYING RANGES
123-----------------
Junio C Hamanoe1aa7472006-11-09 07:37:50124
Junio C Hamano1aa40d22010-01-21 17:46:43125Unlike 'git blame' and 'git annotate' in older versions of git, the extent
Junio C Hamanofd83b8e2009-03-22 08:21:41126of the annotation can be limited to both line ranges and revision
Junio C Hamanoe1aa7472006-11-09 07:37:50127ranges. When you are interested in finding the origin for
Junio C Hamanofd83b8e2009-03-22 08:21:41128lines 40-60 for file `foo`, you can use the `-L` option like so
Junio C Hamanoe58607f2007-01-17 23:27:45129(they mean the same thing -- both ask for 21 lines starting at
130line 40):
Junio C Hamanoe1aa7472006-11-09 07:37:50131
132git blame -L 40,60 foo
Junio C Hamanoe58607f2007-01-17 23:27:45133git blame -L 40,+21 foo
Junio C Hamanoe1aa7472006-11-09 07:37:50134
Junio C Hamanofd83b8e2009-03-22 08:21:41135Also you can use a regular expression to specify the line range:
Junio C Hamano4a345d22006-11-09 18:45:32136
137git blame -L '/^sub hello {/,/^}$/' foo
138
Junio C Hamanofd83b8e2009-03-22 08:21:41139which limits the annotation to the body of the `hello` subroutine.
Junio C Hamano4a345d22006-11-09 18:45:32140
Junio C Hamanofd83b8e2009-03-22 08:21:41141When you are not interested in changes older than version
Junio C Hamanoe1aa7472006-11-09 07:37:50142v2.6.18, or changes older than 3 weeks, you can use revision
Junio C Hamano1aa40d22010-01-21 17:46:43143range specifiers similar to 'git rev-list':
Junio C Hamanoe1aa7472006-11-09 07:37:50144
145git blame v2.6.18.. -- foo
146git blame --since=3.weeks -- foo
147
148When revision range specifiers are used to limit the annotation,
149lines that have not changed since the range boundary (either the
150commit v2.6.18 or the most recent commit that is more than 3
151weeks old in the above example) are blamed for that range
152boundary commit.
153
Junio C Hamanofd83b8e2009-03-22 08:21:41154A particularly useful way is to see if an added file has lines
Junio C Hamanoe1aa7472006-11-09 07:37:50155created by copy-and-paste from existing files. Sometimes this
156indicates that the developer was being sloppy and did not
157refactor the code properly. You can first find the commit that
158introduced the file with:
159
160git log --diff-filter=A --pretty=short -- foo
161
162and then annotate the change between the commit and its
Junio C Hamanob76a6862012-05-02 22:02:46163parents, using `commit^!` notation:
Junio C Hamanoe1aa7472006-11-09 07:37:50164
165git blame -C -C -f $commit^! -- foo
166
167
Junio C Hamano5a702332007-01-28 20:55:22168INCREMENTAL OUTPUT
169------------------
170
171When called with `--incremental` option, the command outputs the
172result as it is built. The output generally will talk about
173lines touched by more recent commits first (i.e. the lines will
174be annotated out of order) and is meant to be used by
175interactive viewers.
176
177The output format is similar to the Porcelain format, but it
178does not contain the actual lines from the file that is being
179annotated.
180
181. Each blame entry always starts with a line of:
182
183<40-byte hex sha1> <sourceline> <resultline> <num_lines>
184+
185Line numbers count from 1.
186
Junio C Hamanofd83b8e2009-03-22 08:21:41187. The first time that a commit shows up in the stream, it has various
Junio C Hamano5a702332007-01-28 20:55:22188 other information about it printed out with a one-word tag at the
Junio C Hamanofd83b8e2009-03-22 08:21:41189 beginning of each line describing the extra commit information (author,
190 email, committer, dates, summary, etc.).
Junio C Hamano5a702332007-01-28 20:55:22191
Junio C Hamanofd83b8e2009-03-22 08:21:41192. Unlike the Porcelain format, the filename information is always
Junio C Hamano5a702332007-01-28 20:55:22193 given and terminates the entry:
194
195"filename" <whitespace-quoted-filename-goes-here>
196+
Junio C Hamanofd83b8e2009-03-22 08:21:41197and thus it is really quite easy to parse for some line- and word-oriented
Junio C Hamano5a702332007-01-28 20:55:22198parser (which should be quite natural for most scripting languages).
199+
200[NOTE]
201For people who do parsing: to make it more robust, just ignore any
Junio C Hamanofd83b8e2009-03-22 08:21:41202lines between the first and last one ("<sha1>" and "filename" lines)
203where you do not recognize the tag words (or care about that particular
Junio C Hamano5a702332007-01-28 20:55:22204one) at the beginning of the "extended information" lines. That way, if
205there is ever added information (like the commit encoding or extended
Junio C Hamanofd83b8e2009-03-22 08:21:41206commit commentary), a blame viewer will not care.
Junio C Hamano5a702332007-01-28 20:55:22207
208
Junio C Hamano8bc410e2009-02-15 10:38:19209MAPPING AUTHORS
210---------------
211
212include::mailmap.txt[]
213
214
Junio C Hamanob33fb4f2006-04-18 21:30:51215SEE ALSO
216--------
Junio C Hamano35738e82008-01-07 07:55:46217linkgit:git-annotate[1]
Junio C Hamanob33fb4f2006-04-18 21:30:51218
Junio C Hamanob33fb4f2006-04-18 21:30:51219GIT
220---
Junio C Hamanof7c042d2008-06-06 22:50:53221Part of the linkgit:git[1] suite