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