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