Jonas Fonseca | 8f2b72a | 2006-03-06 06:24:44 +0100 | [diff] [blame] | 1 | git-blame(1) |
| 2 | ============ |
| 3 | |
| 4 | NAME |
| 5 | ---- |
Jonas Fonseca | 26e8c5d | 2006-08-25 03:01:49 +0200 | [diff] [blame] | 6 | git-blame - Show what revision and author last modified each line of a file |
Jonas Fonseca | 8f2b72a | 2006-03-06 06:24:44 +0100 | [diff] [blame] | 7 | |
| 8 | SYNOPSIS |
| 9 | -------- |
Junio C Hamano | acca687 | 2006-11-08 18:47:54 -0800 | [diff] [blame] | 10 | [verse] |
Thomas Rast | 13b8f68 | 2013-03-28 17:47:33 +0100 | [diff] [blame] | 11 | 'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-e] [-p] [-w] [--incremental] |
Eric Sunshine | 5bd9b79 | 2013-08-06 09:59:40 -0400 | [diff] [blame] | 12 | [-L <range>] [-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<date>] |
Thomas Rast | 13b8f68 | 2013-03-28 17:47:33 +0100 | [diff] [blame] | 13 | [--abbrev=<n>] [<rev> | --contents <file> | --reverse <rev>] [--] <file> |
Jonas Fonseca | 8f2b72a | 2006-03-06 06:24:44 +0100 | [diff] [blame] | 14 | |
| 15 | DESCRIPTION |
| 16 | ----------- |
Jonas Fonseca | 26e8c5d | 2006-08-25 03:01:49 +0200 | [diff] [blame] | 17 | |
| 18 | Annotates each line in the given file with information from the revision which |
| 19 | last modified the line. Optionally, start annotating from the given revision. |
| 20 | |
Eric Sunshine | 5bd9b79 | 2013-08-06 09:59:40 -0400 | [diff] [blame] | 21 | When specified one or more times, `-L` restricts annotation to the requested |
| 22 | lines. |
Junio C Hamano | acca687 | 2006-11-08 18:47:54 -0800 | [diff] [blame] | 23 | |
Junio C Hamano | e5dce96 | 2012-09-21 12:09:42 -0700 | [diff] [blame] | 24 | The origin of lines is automatically followed across whole-file |
| 25 | renames (currently there is no option to turn the rename-following |
| 26 | off). To follow lines moved from one file to another, or to follow |
| 27 | lines that were copied and pasted from another file, etc., see the |
| 28 | `-C` and `-M` options. |
| 29 | |
David J. Mellor | b89510f | 2009-03-16 23:16:16 -0700 | [diff] [blame] | 30 | The report does not tell you anything about lines which have been deleted or |
Thomas Rast | 0b444cd | 2010-01-10 00:33:00 +0100 | [diff] [blame] | 31 | replaced; you need to use a tool such as 'git diff' or the "pickaxe" |
Jonas Fonseca | 26e8c5d | 2006-08-25 03:01:49 +0200 | [diff] [blame] | 32 | interface briefly mentioned in the following paragraph. |
| 33 | |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 34 | Apart from supporting file annotation, Git also supports searching the |
René Scharfe | 23bfbb8 | 2007-01-17 16:32:41 +0100 | [diff] [blame] | 35 | development history for when a code snippet occurred in a change. This makes it |
Jonas Fonseca | 26e8c5d | 2006-08-25 03:01:49 +0200 | [diff] [blame] | 36 | possible to track when a code snippet was added to a file, moved or copied |
| 37 | between files, and eventually deleted or replaced. It works by searching for |
Albert L. Lash, IV | 246090a | 2014-02-08 15:41:37 -0500 | [diff] [blame] | 38 | a text string in the diff. A small example of the pickaxe interface |
| 39 | that searches for `blame_usage`: |
Jonas Fonseca | 26e8c5d | 2006-08-25 03:01:49 +0200 | [diff] [blame] | 40 | |
| 41 | ----------------------------------------------------------------------------- |
| 42 | $ git log --pretty=oneline -S'blame_usage' |
| 43 | 5040f17eba15504bad66b14a645bddd9b015ebb7 blame -S <ancestry-file> |
| 44 | ea4c7f9bf69e781dd0cd88d2bccb2bf5cc15c9a7 git-blame: Make the output |
| 45 | ----------------------------------------------------------------------------- |
Jonas Fonseca | 8f2b72a | 2006-03-06 06:24:44 +0100 | [diff] [blame] | 46 | |
| 47 | OPTIONS |
| 48 | ------- |
Andrew Ruder | 635f4a3 | 2007-04-16 01:20:34 -0500 | [diff] [blame] | 49 | include::blame-options.txt[] |
| 50 | |
| 51 | -c:: |
Dan McGee | 5162e69 | 2007-12-29 00:20:38 -0600 | [diff] [blame] | 52 | Use the same output mode as linkgit:git-annotate[1] (Default: off). |
Jonas Fonseca | 8f2b72a | 2006-03-06 06:24:44 +0100 | [diff] [blame] | 53 | |
Andrew Ruder | 635f4a3 | 2007-04-16 01:20:34 -0500 | [diff] [blame] | 54 | --score-debug:: |
| 55 | Include debugging information related to the movement of |
| 56 | lines between files (see `-C`) and lines moved within a |
| 57 | file (see `-M`). The first number listed is the score. |
| 58 | This is the number of alphanumeric characters detected |
David J. Mellor | b89510f | 2009-03-16 23:16:16 -0700 | [diff] [blame] | 59 | as having been moved between or within files. This must be above |
Thomas Rast | 0b444cd | 2010-01-10 00:33:00 +0100 | [diff] [blame] | 60 | a certain threshold for 'git blame' to consider those lines |
Andrew Ruder | 635f4a3 | 2007-04-16 01:20:34 -0500 | [diff] [blame] | 61 | of code to have been moved. |
Jonas Fonseca | 8f2b72a | 2006-03-06 06:24:44 +0100 | [diff] [blame] | 62 | |
Stephan Beyer | 3240240 | 2008-06-08 03:36:09 +0200 | [diff] [blame] | 63 | -f:: |
| 64 | --show-name:: |
David J. Mellor | b89510f | 2009-03-16 23:16:16 -0700 | [diff] [blame] | 65 | Show the filename in the original commit. By default |
| 66 | the filename is shown if there is any line that came from a |
| 67 | file with a different name, due to rename detection. |
Junio C Hamano | b24642b | 2006-10-12 00:44:27 -0700 | [diff] [blame] | 68 | |
Stephan Beyer | 3240240 | 2008-06-08 03:36:09 +0200 | [diff] [blame] | 69 | -n:: |
| 70 | --show-number:: |
David J. Mellor | b89510f | 2009-03-16 23:16:16 -0700 | [diff] [blame] | 71 | Show the line number in the original commit (Default: off). |
Junio C Hamano | b24642b | 2006-10-12 00:44:27 -0700 | [diff] [blame] | 72 | |
Junio C Hamano | 093dc5b | 2007-04-12 15:50:45 -0700 | [diff] [blame] | 73 | -s:: |
David J. Mellor | b89510f | 2009-03-16 23:16:16 -0700 | [diff] [blame] | 74 | Suppress the author name and timestamp from the output. |
Junio C Hamano | 093dc5b | 2007-04-12 15:50:45 -0700 | [diff] [blame] | 75 | |
Kevin Ballard | 1b8cdce | 2010-10-15 23:57:51 -0700 | [diff] [blame] | 76 | -e:: |
| 77 | --show-email:: |
| 78 | Show the author email instead of author name (Default: off). |
| 79 | |
Junio C Hamano | b82871b | 2007-06-09 18:14:56 -0700 | [diff] [blame] | 80 | -w:: |
David J. Mellor | b89510f | 2009-03-16 23:16:16 -0700 | [diff] [blame] | 81 | Ignore whitespace when comparing the parent's version and |
| 82 | the child's to find where the lines came from. |
Junio C Hamano | b82871b | 2007-06-09 18:14:56 -0700 | [diff] [blame] | 83 | |
Namhyung Kim | 84393bf | 2011-04-06 11:20:50 +0900 | [diff] [blame] | 84 | --abbrev=<n>:: |
| 85 | Instead of using the default 7+1 hexadecimal digits as the |
| 86 | abbreviated object name, use <n>+1 digits. Note that 1 column |
| 87 | is used for a caret to mark the boundary commit. |
| 88 | |
Junio C Hamano | b82871b | 2007-06-09 18:14:56 -0700 | [diff] [blame] | 89 | |
Junio C Hamano | b24642b | 2006-10-12 00:44:27 -0700 | [diff] [blame] | 90 | THE PORCELAIN FORMAT |
| 91 | -------------------- |
| 92 | |
| 93 | In this format, each line is output after a header; the |
René Scharfe | 23bfbb8 | 2007-01-17 16:32:41 +0100 | [diff] [blame] | 94 | header at the minimum has the first line which has: |
Junio C Hamano | b24642b | 2006-10-12 00:44:27 -0700 | [diff] [blame] | 95 | |
| 96 | - 40-byte SHA-1 of the commit the line is attributed to; |
| 97 | - the line number of the line in the original file; |
| 98 | - the line number of the line in the final file; |
David J. Mellor | b89510f | 2009-03-16 23:16:16 -0700 | [diff] [blame] | 99 | - on a line that starts a group of lines from a different |
Junio C Hamano | b24642b | 2006-10-12 00:44:27 -0700 | [diff] [blame] | 100 | commit than the previous one, the number of lines in this |
| 101 | group. On subsequent lines this field is absent. |
| 102 | |
| 103 | This header line is followed by the following information |
| 104 | at least once for each commit: |
| 105 | |
David J. Mellor | b89510f | 2009-03-16 23:16:16 -0700 | [diff] [blame] | 106 | - the author name ("author"), email ("author-mail"), time |
Jason St. John | 0ffa154 | 2013-11-08 19:48:52 -0500 | [diff] [blame] | 107 | ("author-time"), and time zone ("author-tz"); similarly |
Junio C Hamano | b24642b | 2006-10-12 00:44:27 -0700 | [diff] [blame] | 108 | for committer. |
David J. Mellor | b89510f | 2009-03-16 23:16:16 -0700 | [diff] [blame] | 109 | - the filename in the commit that the line is attributed to. |
Junio C Hamano | b24642b | 2006-10-12 00:44:27 -0700 | [diff] [blame] | 110 | - the first line of the commit log message ("summary"). |
| 111 | |
| 112 | The contents of the actual line is output after the above |
| 113 | header, prefixed by a TAB. This is to allow adding more |
| 114 | header elements later. |
| 115 | |
Jeff King | ed747dd | 2011-05-09 09:34:42 -0400 | [diff] [blame] | 116 | The porcelain format generally suppresses commit information that has |
| 117 | already been seen. For example, two lines that are blamed to the same |
| 118 | commit will both be shown, but the details for that commit will be shown |
| 119 | only once. This is more efficient, but may require more state be kept by |
| 120 | the reader. The `--line-porcelain` option can be used to output full |
| 121 | commit information for each line, allowing simpler (but less efficient) |
| 122 | usage like: |
| 123 | |
| 124 | # count the number of lines attributed to each author |
| 125 | git blame --line-porcelain file | |
| 126 | sed -n 's/^author //p' | |
| 127 | sort | uniq -c | sort -rn |
| 128 | |
Junio C Hamano | acca687 | 2006-11-08 18:47:54 -0800 | [diff] [blame] | 129 | |
René Scharfe | 23bfbb8 | 2007-01-17 16:32:41 +0100 | [diff] [blame] | 130 | SPECIFYING RANGES |
| 131 | ----------------- |
Junio C Hamano | acca687 | 2006-11-08 18:47:54 -0800 | [diff] [blame] | 132 | |
Thomas Rast | 0b444cd | 2010-01-10 00:33:00 +0100 | [diff] [blame] | 133 | Unlike 'git blame' and 'git annotate' in older versions of git, the extent |
David J. Mellor | b89510f | 2009-03-16 23:16:16 -0700 | [diff] [blame] | 134 | of the annotation can be limited to both line ranges and revision |
Eric Sunshine | 5bd9b79 | 2013-08-06 09:59:40 -0400 | [diff] [blame] | 135 | ranges. The `-L` option, which limits annotation to a range of lines, may be |
| 136 | specified multiple times. |
| 137 | |
| 138 | When you are interested in finding the origin for |
David J. Mellor | b89510f | 2009-03-16 23:16:16 -0700 | [diff] [blame] | 139 | lines 40-60 for file `foo`, you can use the `-L` option like so |
Junio C Hamano | 42f62db | 2007-01-17 13:04:15 -0800 | [diff] [blame] | 140 | (they mean the same thing -- both ask for 21 lines starting at |
| 141 | line 40): |
Junio C Hamano | acca687 | 2006-11-08 18:47:54 -0800 | [diff] [blame] | 142 | |
| 143 | git blame -L 40,60 foo |
Junio C Hamano | 42f62db | 2007-01-17 13:04:15 -0800 | [diff] [blame] | 144 | git blame -L 40,+21 foo |
Junio C Hamano | acca687 | 2006-11-08 18:47:54 -0800 | [diff] [blame] | 145 | |
David J. Mellor | b89510f | 2009-03-16 23:16:16 -0700 | [diff] [blame] | 146 | Also you can use a regular expression to specify the line range: |
Junio C Hamano | 18d5453 | 2006-11-09 10:44:56 -0800 | [diff] [blame] | 147 | |
| 148 | git blame -L '/^sub hello {/,/^}$/' foo |
| 149 | |
David J. Mellor | b89510f | 2009-03-16 23:16:16 -0700 | [diff] [blame] | 150 | which limits the annotation to the body of the `hello` subroutine. |
Junio C Hamano | 18d5453 | 2006-11-09 10:44:56 -0800 | [diff] [blame] | 151 | |
David J. Mellor | b89510f | 2009-03-16 23:16:16 -0700 | [diff] [blame] | 152 | When you are not interested in changes older than version |
Junio C Hamano | acca687 | 2006-11-08 18:47:54 -0800 | [diff] [blame] | 153 | v2.6.18, or changes older than 3 weeks, you can use revision |
Thomas Rast | 0b444cd | 2010-01-10 00:33:00 +0100 | [diff] [blame] | 154 | range specifiers similar to 'git rev-list': |
Junio C Hamano | acca687 | 2006-11-08 18:47:54 -0800 | [diff] [blame] | 155 | |
| 156 | git blame v2.6.18.. -- foo |
| 157 | git blame --since=3.weeks -- foo |
| 158 | |
| 159 | When revision range specifiers are used to limit the annotation, |
| 160 | lines that have not changed since the range boundary (either the |
| 161 | commit v2.6.18 or the most recent commit that is more than 3 |
| 162 | weeks old in the above example) are blamed for that range |
| 163 | boundary commit. |
| 164 | |
David J. Mellor | b89510f | 2009-03-16 23:16:16 -0700 | [diff] [blame] | 165 | A particularly useful way is to see if an added file has lines |
Junio C Hamano | acca687 | 2006-11-08 18:47:54 -0800 | [diff] [blame] | 166 | created by copy-and-paste from existing files. Sometimes this |
| 167 | indicates that the developer was being sloppy and did not |
| 168 | refactor the code properly. You can first find the commit that |
| 169 | introduced the file with: |
| 170 | |
| 171 | git log --diff-filter=A --pretty=short -- foo |
| 172 | |
| 173 | and then annotate the change between the commit and its |
Jeff King | 6cf378f | 2012-04-26 04:51:57 -0400 | [diff] [blame] | 174 | parents, using `commit^!` notation: |
Junio C Hamano | acca687 | 2006-11-08 18:47:54 -0800 | [diff] [blame] | 175 | |
| 176 | git blame -C -C -f $commit^! -- foo |
| 177 | |
| 178 | |
Junio C Hamano | 57e7a0a | 2007-01-28 12:21:53 -0800 | [diff] [blame] | 179 | INCREMENTAL OUTPUT |
| 180 | ------------------ |
| 181 | |
| 182 | When called with `--incremental` option, the command outputs the |
| 183 | result as it is built. The output generally will talk about |
| 184 | lines touched by more recent commits first (i.e. the lines will |
| 185 | be annotated out of order) and is meant to be used by |
| 186 | interactive viewers. |
| 187 | |
| 188 | The output format is similar to the Porcelain format, but it |
| 189 | does not contain the actual lines from the file that is being |
| 190 | annotated. |
| 191 | |
| 192 | . Each blame entry always starts with a line of: |
| 193 | |
| 194 | <40-byte hex sha1> <sourceline> <resultline> <num_lines> |
| 195 | + |
| 196 | Line numbers count from 1. |
| 197 | |
David J. Mellor | b89510f | 2009-03-16 23:16:16 -0700 | [diff] [blame] | 198 | . The first time that a commit shows up in the stream, it has various |
Junio C Hamano | 57e7a0a | 2007-01-28 12:21:53 -0800 | [diff] [blame] | 199 | other information about it printed out with a one-word tag at the |
David J. Mellor | b89510f | 2009-03-16 23:16:16 -0700 | [diff] [blame] | 200 | beginning of each line describing the extra commit information (author, |
| 201 | email, committer, dates, summary, etc.). |
Junio C Hamano | 57e7a0a | 2007-01-28 12:21:53 -0800 | [diff] [blame] | 202 | |
David J. Mellor | b89510f | 2009-03-16 23:16:16 -0700 | [diff] [blame] | 203 | . Unlike the Porcelain format, the filename information is always |
Junio C Hamano | 57e7a0a | 2007-01-28 12:21:53 -0800 | [diff] [blame] | 204 | given and terminates the entry: |
| 205 | |
| 206 | "filename" <whitespace-quoted-filename-goes-here> |
| 207 | + |
David J. Mellor | b89510f | 2009-03-16 23:16:16 -0700 | [diff] [blame] | 208 | and thus it is really quite easy to parse for some line- and word-oriented |
Junio C Hamano | 57e7a0a | 2007-01-28 12:21:53 -0800 | [diff] [blame] | 209 | parser (which should be quite natural for most scripting languages). |
| 210 | + |
| 211 | [NOTE] |
| 212 | For people who do parsing: to make it more robust, just ignore any |
David J. Mellor | b89510f | 2009-03-16 23:16:16 -0700 | [diff] [blame] | 213 | lines between the first and last one ("<sha1>" and "filename" lines) |
| 214 | where you do not recognize the tag words (or care about that particular |
Junio C Hamano | 57e7a0a | 2007-01-28 12:21:53 -0800 | [diff] [blame] | 215 | one) at the beginning of the "extended information" lines. That way, if |
| 216 | there is ever added information (like the commit encoding or extended |
David J. Mellor | b89510f | 2009-03-16 23:16:16 -0700 | [diff] [blame] | 217 | commit commentary), a blame viewer will not care. |
Junio C Hamano | 57e7a0a | 2007-01-28 12:21:53 -0800 | [diff] [blame] | 218 | |
| 219 | |
Marius Storm-Olsen | 7d48e9e | 2009-02-08 15:34:31 +0100 | [diff] [blame] | 220 | MAPPING AUTHORS |
| 221 | --------------- |
| 222 | |
| 223 | include::mailmap.txt[] |
| 224 | |
| 225 | |
Jonas Fonseca | 8f2b72a | 2006-03-06 06:24:44 +0100 | [diff] [blame] | 226 | SEE ALSO |
| 227 | -------- |
Dan McGee | 5162e69 | 2007-12-29 00:20:38 -0600 | [diff] [blame] | 228 | linkgit:git-annotate[1] |
Jonas Fonseca | 8f2b72a | 2006-03-06 06:24:44 +0100 | [diff] [blame] | 229 | |
Jonas Fonseca | 8f2b72a | 2006-03-06 06:24:44 +0100 | [diff] [blame] | 230 | GIT |
| 231 | --- |
Christian Couder | 9e1f0a8 | 2008-06-06 09:07:32 +0200 | [diff] [blame] | 232 | Part of the linkgit:git[1] suite |