forked from git/git
-
Notifications
You must be signed in to change notification settings - Fork 1
Expand file tree
/
Copy pathgit-blame.html
More file actions
869 lines (832 loc) · 23.5 KB
/
git-blame.html
File metadata and controls
869 lines (832 loc) · 23.5 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 8.2.5" />
<style type="text/css">
/* Debug borders */
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
/*
border: 1px solid red;
*/
}
body {
margin: 1em 5% 1em 5%;
}
a {
color: blue;
text-decoration: underline;
}
a:visited {
color: fuchsia;
}
em {
font-style: italic;
}
strong {
font-weight: bold;
}
tt {
color: navy;
}
h1, h2, h3, h4, h5, h6 {
color: #527bbd;
font-family: sans-serif;
margin-top: 1.2em;
margin-bottom: 0.5em;
line-height: 1.3;
}
h1, h2, h3 {
border-bottom: 2px solid silver;
}
h2 {
padding-top: 0.5em;
}
h3 {
float: left;
}
h3 + * {
clear: left;
}
div.sectionbody {
font-family: serif;
margin-left: 0;
}
hr {
border: 1px solid silver;
}
p {
margin-top: 0.5em;
margin-bottom: 0.5em;
}
pre {
padding: 0;
margin: 0;
}
span#author {
color: #527bbd;
font-family: sans-serif;
font-weight: bold;
font-size: 1.1em;
}
span#email {
}
span#revision {
font-family: sans-serif;
}
div#footer {
font-family: sans-serif;
font-size: small;
border-top: 2px solid silver;
padding-top: 0.5em;
margin-top: 4.0em;
}
div#footer-text {
float: left;
padding-bottom: 0.5em;
}
div#footer-badges {
float: right;
padding-bottom: 0.5em;
}
div#preamble,
div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
div.admonitionblock {
margin-right: 10%;
margin-top: 1.5em;
margin-bottom: 1.5em;
}
div.admonitionblock {
margin-top: 2.5em;
margin-bottom: 2.5em;
}
div.content { /* Block element content. */
padding: 0;
}
/* Block element titles. */
div.title, caption.title {
font-family: sans-serif;
font-weight: bold;
text-align: left;
margin-top: 1.0em;
margin-bottom: 0.5em;
}
div.title + * {
margin-top: 0;
}
td div.title:first-child {
margin-top: 0.0em;
}
div.content div.title:first-child {
margin-top: 0.0em;
}
div.content + div.title {
margin-top: 0.0em;
}
div.sidebarblock > div.content {
background: #ffffee;
border: 1px solid silver;
padding: 0.5em;
}
div.listingblock {
margin-right: 0%;
}
div.listingblock > div.content {
border: 1px solid silver;
background: #f4f4f4;
padding: 0.5em;
}
div.quoteblock > div.content {
padding-left: 2.0em;
}
div.attribution {
text-align: right;
}
div.verseblock + div.attribution {
text-align: left;
}
div.admonitionblock .icon {
vertical-align: top;
font-size: 1.1em;
font-weight: bold;
text-decoration: underline;
color: #527bbd;
padding-right: 0.5em;
}
div.admonitionblock td.content {
padding-left: 0.5em;
border-left: 2px solid silver;
}
div.exampleblock > div.content {
border-left: 2px solid silver;
padding: 0.5em;
}
div.verseblock div.content {
white-space: pre;
}
div.imageblock div.content { padding-left: 0; }
div.imageblock img { border: 1px solid silver; }
span.image img { border-style: none; }
dl {
margin-top: 0.8em;
margin-bottom: 0.8em;
}
dt {
margin-top: 0.5em;
margin-bottom: 0;
font-style: italic;
}
dd > *:first-child {
margin-top: 0;
}
ul, ol {
list-style-position: outside;
}
div.olist2 ol {
list-style-type: lower-alpha;
}
div.tableblock > table {
border: 3px solid #527bbd;
}
thead {
font-family: sans-serif;
font-weight: bold;
}
tfoot {
font-weight: bold;
}
div.hlist {
margin-top: 0.8em;
margin-bottom: 0.8em;
}
div.hlist td {
padding-bottom: 5px;
}
td.hlist1 {
vertical-align: top;
font-style: italic;
padding-right: 0.8em;
}
td.hlist2 {
vertical-align: top;
}
@media print {
div#footer-badges { display: none; }
}
div#toctitle {
color: #527bbd;
font-family: sans-serif;
font-size: 1.1em;
font-weight: bold;
margin-top: 1.0em;
margin-bottom: 0.1em;
}
div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
margin-top: 0;
margin-bottom: 0;
}
div.toclevel2 {
margin-left: 2em;
font-size: 0.9em;
}
div.toclevel3 {
margin-left: 4em;
font-size: 0.9em;
}
div.toclevel4 {
margin-left: 6em;
font-size: 0.9em;
}
include1::./stylesheets/xhtml11-manpage.css[]
/* Workarounds for IE6's broken and incomplete CSS2. */
div.sidebar-content {
background: #ffffee;
border: 1px solid silver;
padding: 0.5em;
}
div.sidebar-title, div.image-title {
font-family: sans-serif;
font-weight: bold;
margin-top: 0.0em;
margin-bottom: 0.5em;
}
div.listingblock div.content {
border: 1px solid silver;
background: #f4f4f4;
padding: 0.5em;
}
div.quoteblock-content {
padding-left: 2.0em;
}
div.exampleblock-content {
border-left: 2px solid silver;
padding-left: 0.5em;
}
/* IE6 sets dynamically generated links as visited. */
div#toc a:visited { color: blue; }
</style>
<title>git-blame(1)</title>
</head>
<body>
<div id="header">
<h1>
git-blame(1) Manual Page
</h1>
<h2>NAME</h2>
<div class="sectionbody">
<p>git-blame -
Show what revision and author last modified each line of a file
</p>
</div>
</div>
<h2>SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
<div class="content"><em>git blame</em> [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-p] [-w] [--incremental] [-L n,m]
[-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<date>]
[<rev> | --contents <file> | --reverse <rev>] [--] <file></div></div>
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
<div class="para"><p>Annotates each line in the given file with information from the revision which
last modified the line. Optionally, start annotating from the given revision.</p></div>
<div class="para"><p>The command can also limit the range of lines annotated.</p></div>
<div class="para"><p>The report does not tell you anything about lines which have been deleted or
replaced; you need to use a tool such as <em>git diff</em> or the "pickaxe"
interface briefly mentioned in the following paragraph.</p></div>
<div class="para"><p>Apart from supporting file annotation, git also supports searching the
development history for when a code snippet occurred in a change. This makes it
possible to track when a code snippet was added to a file, moved or copied
between files, and eventually deleted or replaced. It works by searching for
a text string in the diff. A small example:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git log --pretty=oneline -S'blame_usage'
5040f17eba15504bad66b14a645bddd9b015ebb7 blame -S <ancestry-file>
ea4c7f9bf69e781dd0cd88d2bccb2bf5cc15c9a7 git-blame: Make the output</tt></pre>
</div></div>
</div>
<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
<div class="vlist"><dl>
<dt>
-b
</dt>
<dd>
<p>
Show blank SHA-1 for boundary commits. This can also
be controlled via the <tt>blame.blankboundary</tt> config option.
</p>
</dd>
<dt>
--root
</dt>
<dd>
<p>
Do not treat root commits as boundaries. This can also be
controlled via the <tt>blame.showroot</tt> config option.
</p>
</dd>
<dt>
--show-stats
</dt>
<dd>
<p>
Include additional statistics at the end of blame output.
</p>
</dd>
<dt>
-L <start>,<end>
</dt>
<dd>
<p>
Annotate only the given line range. <start> and <end> can take
one of these forms:
</p>
<div class="ilist"><ul>
<li>
<p>
number
</p>
<div class="para"><p>If <start> or <end> is a number, it specifies an
absolute line number (lines count from 1).</p></div>
</li>
<li>
<p>
/regex/
</p>
<div class="para"><p>This form will use the first line matching the given
POSIX regex. If <end> is a regex, it will search
starting at the line given by <start>.</p></div>
</li>
<li>
<p>
+offset or -offset
</p>
<div class="para"><p>This is only valid for <end> and will specify a number
of lines before or after the line given by <start>.</p></div>
</li>
</ul></div>
</dd>
<dt>
-l
</dt>
<dd>
<p>
Show long rev (Default: off).
</p>
</dd>
<dt>
-t
</dt>
<dd>
<p>
Show raw timestamp (Default: off).
</p>
</dd>
<dt>
-S <revs-file>
</dt>
<dd>
<p>
Use revisions from revs-file instead of calling <a href="git-rev-list.html">git-rev-list(1)</a>.
</p>
</dd>
<dt>
--reverse
</dt>
<dd>
<p>
Walk history forward instead of backward. Instead of showing
the revision in which a line appeared, this shows the last
revision in which a line has existed. This requires a range of
revision like START..END where the path to blame exists in
START.
</p>
</dd>
<dt>
-p
</dt>
<dt>
--porcelain
</dt>
<dd>
<p>
Show in a format designed for machine consumption.
</p>
</dd>
<dt>
--incremental
</dt>
<dd>
<p>
Show the result incrementally in a format designed for
machine consumption.
</p>
</dd>
<dt>
--encoding=<encoding>
</dt>
<dd>
<p>
Specifies the encoding used to output author names
and commit summaries. Setting it to <tt>none</tt> makes blame
output unconverted data. For more information see the
discussion about encoding in the <a href="git-log.html">git-log(1)</a>
manual page.
</p>
</dd>
<dt>
--contents <file>
</dt>
<dd>
<p>
When <rev> is not specified, the command annotates the
changes starting backwards from the working tree copy.
This flag makes the command pretend as if the working
tree copy has the contents of the named file (specify
<tt>-</tt> to make the command read from the standard input).
</p>
</dd>
<dt>
--date <format>
</dt>
<dd>
<p>
The value is one of the following alternatives:
{relative,local,default,iso,rfc,short}. If --date is not
provided, the value of the blame.date config variable is
used. If the blame.date config variable is also not set, the
iso format is used. For more information, See the discussion
of the --date option at <a href="git-log.html">git-log(1)</a>.
</p>
</dd>
<dt>
-M|<num>|
</dt>
<dd>
<p>
Detect moved or copied lines within a file. When a commit
moves or copies a block of lines (e.g. the original file
has A and then B, and the commit changes it to B and then
A), the traditional <em>blame</em> algorithm notices only half of
the movement and typically blames the lines that were moved
up (i.e. B) to the parent and assigns blame to the lines that
were moved down (i.e. A) to the child commit. With this
option, both groups of lines are blamed on the parent by
running extra passes of inspection.
</p>
<div class="para"><p><num> is optional but it is the lower bound on the number of
alphanumeric characters that git must detect as moving/copying
within a file for it to associate those lines with the parent
commit. The default value is 20.</p></div>
</dd>
<dt>
-C|<num>|
</dt>
<dd>
<p>
In addition to <tt>-M</tt>, detect lines moved or copied from other
files that were modified in the same commit. This is
useful when you reorganize your program and move code
around across files. When this option is given twice,
the command additionally looks for copies from other
files in the commit that creates the file. When this
option is given three times, the command additionally
looks for copies from other files in any commit.
</p>
<div class="para"><p><num> is optional but it is the lower bound on the number of
alphanumeric characters that git must detect as moving/copying
between files for it to associate those lines with the parent
commit. And the default value is 40. If there are more than one
<tt>-C</tt> options given, the <num> argument of the last <tt>-C</tt> will
take effect.</p></div>
</dd>
<dt>
-h
</dt>
<dt>
--help
</dt>
<dd>
<p>
Show help message.
</p>
</dd>
<dt>
-c
</dt>
<dd>
<p>
Use the same output mode as <a href="git-annotate.html">git-annotate(1)</a> (Default: off).
</p>
</dd>
<dt>
--score-debug
</dt>
<dd>
<p>
Include debugging information related to the movement of
lines between files (see <tt>-C</tt>) and lines moved within a
file (see <tt>-M</tt>). The first number listed is the score.
This is the number of alphanumeric characters detected
as having been moved between or within files. This must be above
a certain threshold for <em>git blame</em> to consider those lines
of code to have been moved.
</p>
</dd>
<dt>
-f
</dt>
<dt>
--show-name
</dt>
<dd>
<p>
Show the filename in the original commit. By default
the filename is shown if there is any line that came from a
file with a different name, due to rename detection.
</p>
</dd>
<dt>
-n
</dt>
<dt>
--show-number
</dt>
<dd>
<p>
Show the line number in the original commit (Default: off).
</p>
</dd>
<dt>
-s
</dt>
<dd>
<p>
Suppress the author name and timestamp from the output.
</p>
</dd>
<dt>
-w
</dt>
<dd>
<p>
Ignore whitespace when comparing the parent's version and
the child's to find where the lines came from.
</p>
</dd>
</dl></div>
</div>
<h2 id="_the_porcelain_format">THE PORCELAIN FORMAT</h2>
<div class="sectionbody">
<div class="para"><p>In this format, each line is output after a header; the
header at the minimum has the first line which has:</p></div>
<div class="ilist"><ul>
<li>
<p>
40-byte SHA-1 of the commit the line is attributed to;
</p>
</li>
<li>
<p>
the line number of the line in the original file;
</p>
</li>
<li>
<p>
the line number of the line in the final file;
</p>
</li>
<li>
<p>
on a line that starts a group of lines from a different
commit than the previous one, the number of lines in this
group. On subsequent lines this field is absent.
</p>
</li>
</ul></div>
<div class="para"><p>This header line is followed by the following information
at least once for each commit:</p></div>
<div class="ilist"><ul>
<li>
<p>
the author name ("author"), email ("author-mail"), time
("author-time"), and timezone ("author-tz"); similarly
for committer.
</p>
</li>
<li>
<p>
the filename in the commit that the line is attributed to.
</p>
</li>
<li>
<p>
the first line of the commit log message ("summary").
</p>
</li>
</ul></div>
<div class="para"><p>The contents of the actual line is output after the above
header, prefixed by a TAB. This is to allow adding more
header elements later.</p></div>
</div>
<h2 id="_specifying_ranges">SPECIFYING RANGES</h2>
<div class="sectionbody">
<div class="para"><p>Unlike <em>git blame</em> and <em>git annotate</em> in older versions of git, the extent
of the annotation can be limited to both line ranges and revision
ranges. When you are interested in finding the origin for
lines 40-60 for file <tt>foo</tt>, you can use the <tt>-L</tt> option like so
(they mean the same thing — both ask for 21 lines starting at
line 40):</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>git blame -L 40,60 foo
git blame -L 40,+21 foo</tt></pre>
</div></div>
<div class="para"><p>Also you can use a regular expression to specify the line range:</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>git blame -L '/^sub hello {/,/^}$/' foo</tt></pre>
</div></div>
<div class="para"><p>which limits the annotation to the body of the <tt>hello</tt> subroutine.</p></div>
<div class="para"><p>When you are not interested in changes older than version
v2.6.18, or changes older than 3 weeks, you can use revision
range specifiers similar to <em>git rev-list</em>:</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>git blame v2.6.18.. -- foo
git blame --since=3.weeks -- foo</tt></pre>
</div></div>
<div class="para"><p>When revision range specifiers are used to limit the annotation,
lines that have not changed since the range boundary (either the
commit v2.6.18 or the most recent commit that is more than 3
weeks old in the above example) are blamed for that range
boundary commit.</p></div>
<div class="para"><p>A particularly useful way is to see if an added file has lines
created by copy-and-paste from existing files. Sometimes this
indicates that the developer was being sloppy and did not
refactor the code properly. You can first find the commit that
introduced the file with:</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>git log --diff-filter=A --pretty=short -- foo</tt></pre>
</div></div>
<div class="para"><p>and then annotate the change between the commit and its
parents, using <tt>commit^!</tt> notation:</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>git blame -C -C -f $commit^! -- foo</tt></pre>
</div></div>
</div>
<h2 id="_incremental_output">INCREMENTAL OUTPUT</h2>
<div class="sectionbody">
<div class="para"><p>When called with <tt>--incremental</tt> option, the command outputs the
result as it is built. The output generally will talk about
lines touched by more recent commits first (i.e. the lines will
be annotated out of order) and is meant to be used by
interactive viewers.</p></div>
<div class="para"><p>The output format is similar to the Porcelain format, but it
does not contain the actual lines from the file that is being
annotated.</p></div>
<div class="olist"><ol>
<li>
<p>
Each blame entry always starts with a line of:
</p>
<div class="literalblock">
<div class="content">
<pre><tt><40-byte hex sha1> <sourceline> <resultline> <num_lines></tt></pre>
</div></div>
<div class="para"><p>Line numbers count from 1.</p></div>
</li>
<li>
<p>
The first time that a commit shows up in the stream, it has various
other information about it printed out with a one-word tag at the
beginning of each line describing the extra commit information (author,
email, committer, dates, summary, etc.).
</p>
</li>
<li>
<p>
Unlike the Porcelain format, the filename information is always
given and terminates the entry:
</p>
<div class="literalblock">
<div class="content">
<pre><tt>"filename" <whitespace-quoted-filename-goes-here></tt></pre>
</div></div>
<div class="para"><p>and thus it is really quite easy to parse for some line- and word-oriented
parser (which should be quite natural for most scripting languages).</p></div>
<div class="admonitionblock">
<table><tr>
<td class="icon">
<div class="title">Note</div>
</td>
<td class="content">For people who do parsing: to make it more robust, just ignore any
lines between the first and last one ("<sha1>" and "filename" lines)
where you do not recognize the tag words (or care about that particular
one) at the beginning of the "extended information" lines. That way, if
there is ever added information (like the commit encoding or extended
commit commentary), a blame viewer will not care.</td>
</tr></table>
</div>
</li>
</ol></div>
</div>
<h2 id="_mapping_authors">MAPPING AUTHORS</h2>
<div class="sectionbody">
<div class="para"><p>If the file <tt>.mailmap</tt> exists at the toplevel of the repository, or at
the location pointed to by the mailmap.file configuration option, it
is used to map author and committer names and email addresses to
canonical real names and email addresses.</p></div>
<div class="para"><p>In the simple form, each line in the file consists of the canonical
real name of an author, whitespace, and an email address used in the
commit (enclosed by <em><</em> and <em>></em>) to map to the name. For example:</p></div>
<div class="literalblock">
<div class="content">
</div></div>
<div class="para"><p>The more complex forms are:</p></div>
<div class="literalblock">
<div class="content">
</div></div>
<div class="para"><p>which allows mailmap to replace only the email part of a commit, and:</p></div>
<div class="literalblock">
<div class="content">
</div></div>
<div class="para"><p>which allows mailmap to replace both the name and the email of a
commit matching the specified commit email address, and:</p></div>
<div class="literalblock">
<div class="content">
</div></div>
<div class="para"><p>which allows mailmap to replace both the name and the email of a
commit matching both the specified commit name and email address.</p></div>
<div class="para"><p>Example 1: Your history contains commits by two authors, Jane
and Joe, whose names appear in the repository under several forms:</p></div>
<div class="listingblock">
<div class="content">
Joe R. Developer <[email protected]>
Jane Doe <[email protected]>
Jane Doe <jane@laptop.(none)>
Jane D. <jane@desktop.(none)></tt></pre>
</div></div>
<div class="para"><p>Now suppose that Joe wants his middle name initial used, and Jane
prefers her family name fully spelled out. A proper <tt>.mailmap</tt> file
would look like:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>Jane Doe <jane@desktop.(none)>
</div></div>
<div class="para"><p>Note how there is no need for an entry for <jane@laptop.(none)>, because the
real name of that author is already correct.</p></div>
<div class="para"><p>Example 2: Your repository contains commits from the following
authors:</p></div>
<div class="listingblock">
<div class="content">
nick2 <[email protected]>
nick2 <[email protected]>
santa <[email protected]>
claus <[email protected]>
</div></div>
<div class="para"><p>Then you might want a <tt>.mailmap</tt> file that looks like:</p></div>
<div class="listingblock">
<div class="content">
Some Dude <[email protected]> nick1 <[email protected]>
Other Author <[email protected]> nick2 <[email protected]>
Other Author <[email protected]> <[email protected]>
</div></div>
<div class="para"><p>Use hash <em>#</em> for comments that are either on their own line, or after
the email address.</p></div>
</div>
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
<div class="para"><p><a href="git-annotate.html">git-annotate(1)</a></p></div>
</div>
<h2 id="_author">AUTHOR</h2>
<div class="sectionbody">
</div>
<h2 id="_git">GIT</h2>
<div class="sectionbody">
<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
</div>
<div id="footer">
<div id="footer-text">
Last updated 2010-09-18 23:56:34 UTC
</div>
</div>
</body>
</html>