Autogenerated HTML docs for v1.7.5.1-339-gb602ed
[git/jnareb-git.git] / git-show.html
blob48e4c721197f1a0e2d952f97cbd5faca0e0a8eba
1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
4 <head>
5 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
6 <meta name="generator" content="AsciiDoc 8.4.5" />
7 <title>git-show(1)</title>
8 <style type="text/css">
9 /* Debug borders */
10 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
12 border: 1px solid red;
16 body {
17 margin: 1em 5% 1em 5%;
20 a {
21 color: blue;
22 text-decoration: underline;
24 a:visited {
25 color: fuchsia;
28 em {
29 font-style: italic;
30 color: navy;
33 strong {
34 font-weight: bold;
35 color: #083194;
38 tt {
39 color: navy;
42 h1, h2, h3, h4, h5, h6 {
43 color: #527bbd;
44 font-family: sans-serif;
45 margin-top: 1.2em;
46 margin-bottom: 0.5em;
47 line-height: 1.3;
50 h1, h2, h3 {
51 border-bottom: 2px solid silver;
53 h2 {
54 padding-top: 0.5em;
56 h3 {
57 float: left;
59 h3 + * {
60 clear: left;
63 div.sectionbody {
64 font-family: serif;
65 margin-left: 0;
68 hr {
69 border: 1px solid silver;
72 p {
73 margin-top: 0.5em;
74 margin-bottom: 0.5em;
77 ul, ol, li > p {
78 margin-top: 0;
81 pre {
82 padding: 0;
83 margin: 0;
86 span#author {
87 color: #527bbd;
88 font-family: sans-serif;
89 font-weight: bold;
90 font-size: 1.1em;
92 span#email {
94 span#revnumber, span#revdate, span#revremark {
95 font-family: sans-serif;
98 div#footer {
99 font-family: sans-serif;
100 font-size: small;
101 border-top: 2px solid silver;
102 padding-top: 0.5em;
103 margin-top: 4.0em;
105 div#footer-text {
106 float: left;
107 padding-bottom: 0.5em;
109 div#footer-badges {
110 float: right;
111 padding-bottom: 0.5em;
114 div#preamble {
115 margin-top: 1.5em;
116 margin-bottom: 1.5em;
118 div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
119 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
120 div.admonitionblock {
121 margin-top: 1.5em;
122 margin-bottom: 1.5em;
124 div.admonitionblock {
125 margin-top: 2.5em;
126 margin-bottom: 2.5em;
129 div.content { /* Block element content. */
130 padding: 0;
133 /* Block element titles. */
134 div.title, caption.title {
135 color: #527bbd;
136 font-family: sans-serif;
137 font-weight: bold;
138 text-align: left;
139 margin-top: 1.0em;
140 margin-bottom: 0.5em;
142 div.title + * {
143 margin-top: 0;
146 td div.title:first-child {
147 margin-top: 0.0em;
149 div.content div.title:first-child {
150 margin-top: 0.0em;
152 div.content + div.title {
153 margin-top: 0.0em;
156 div.sidebarblock > div.content {
157 background: #ffffee;
158 border: 1px solid silver;
159 padding: 0.5em;
162 div.listingblock > div.content {
163 border: 1px solid silver;
164 background: #f4f4f4;
165 padding: 0.5em;
168 div.quoteblock {
169 padding-left: 2.0em;
170 margin-right: 10%;
172 div.quoteblock > div.attribution {
173 padding-top: 0.5em;
174 text-align: right;
177 div.verseblock {
178 padding-left: 2.0em;
179 margin-right: 10%;
181 div.verseblock > div.content {
182 white-space: pre;
184 div.verseblock > div.attribution {
185 padding-top: 0.75em;
186 text-align: left;
188 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
189 div.verseblock + div.attribution {
190 text-align: left;
193 div.admonitionblock .icon {
194 vertical-align: top;
195 font-size: 1.1em;
196 font-weight: bold;
197 text-decoration: underline;
198 color: #527bbd;
199 padding-right: 0.5em;
201 div.admonitionblock td.content {
202 padding-left: 0.5em;
203 border-left: 2px solid silver;
206 div.exampleblock > div.content {
207 border-left: 2px solid silver;
208 padding: 0.5em;
211 div.imageblock div.content { padding-left: 0; }
212 span.image img { border-style: none; }
213 a.image:visited { color: white; }
215 dl {
216 margin-top: 0.8em;
217 margin-bottom: 0.8em;
219 dt {
220 margin-top: 0.5em;
221 margin-bottom: 0;
222 font-style: normal;
223 color: navy;
225 dd > *:first-child {
226 margin-top: 0.1em;
229 ul, ol {
230 list-style-position: outside;
232 ol.arabic {
233 list-style-type: decimal;
235 ol.loweralpha {
236 list-style-type: lower-alpha;
238 ol.upperalpha {
239 list-style-type: upper-alpha;
241 ol.lowerroman {
242 list-style-type: lower-roman;
244 ol.upperroman {
245 list-style-type: upper-roman;
248 div.compact ul, div.compact ol,
249 div.compact p, div.compact p,
250 div.compact div, div.compact div {
251 margin-top: 0.1em;
252 margin-bottom: 0.1em;
255 div.tableblock > table {
256 border: 3px solid #527bbd;
258 thead {
259 font-family: sans-serif;
260 font-weight: bold;
262 tfoot {
263 font-weight: bold;
265 td > div.verse {
266 white-space: pre;
268 p.table {
269 margin-top: 0;
271 /* Because the table frame attribute is overriden by CSS in most browsers. */
272 div.tableblock > table[frame="void"] {
273 border-style: none;
275 div.tableblock > table[frame="hsides"] {
276 border-left-style: none;
277 border-right-style: none;
279 div.tableblock > table[frame="vsides"] {
280 border-top-style: none;
281 border-bottom-style: none;
285 div.hdlist {
286 margin-top: 0.8em;
287 margin-bottom: 0.8em;
289 div.hdlist tr {
290 padding-bottom: 15px;
292 dt.hdlist1.strong, td.hdlist1.strong {
293 font-weight: bold;
295 td.hdlist1 {
296 vertical-align: top;
297 font-style: normal;
298 padding-right: 0.8em;
299 color: navy;
301 td.hdlist2 {
302 vertical-align: top;
304 div.hdlist.compact tr {
305 margin: 0;
306 padding-bottom: 0;
309 .comment {
310 background: yellow;
313 @media print {
314 div#footer-badges { display: none; }
317 div#toctitle {
318 color: #527bbd;
319 font-family: sans-serif;
320 font-size: 1.1em;
321 font-weight: bold;
322 margin-top: 1.0em;
323 margin-bottom: 0.1em;
326 div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
327 margin-top: 0;
328 margin-bottom: 0;
330 div.toclevel2 {
331 margin-left: 2em;
332 font-size: 0.9em;
334 div.toclevel3 {
335 margin-left: 4em;
336 font-size: 0.9em;
338 div.toclevel4 {
339 margin-left: 6em;
340 font-size: 0.9em;
342 /* Overrides for manpage documents */
343 h1 {
344 padding-top: 0.5em;
345 padding-bottom: 0.5em;
346 border-top: 2px solid silver;
347 border-bottom: 2px solid silver;
349 h2 {
350 border-style: none;
352 div.sectionbody {
353 margin-left: 5%;
356 @media print {
357 div#toc { display: none; }
360 /* Workarounds for IE6's broken and incomplete CSS2. */
362 div.sidebar-content {
363 background: #ffffee;
364 border: 1px solid silver;
365 padding: 0.5em;
367 div.sidebar-title, div.image-title {
368 color: #527bbd;
369 font-family: sans-serif;
370 font-weight: bold;
371 margin-top: 0.0em;
372 margin-bottom: 0.5em;
375 div.listingblock div.content {
376 border: 1px solid silver;
377 background: #f4f4f4;
378 padding: 0.5em;
381 div.quoteblock-attribution {
382 padding-top: 0.5em;
383 text-align: right;
386 div.verseblock-content {
387 white-space: pre;
389 div.verseblock-attribution {
390 padding-top: 0.75em;
391 text-align: left;
394 div.exampleblock-content {
395 border-left: 2px solid silver;
396 padding-left: 0.5em;
399 /* IE6 sets dynamically generated links as visited. */
400 div#toc a:visited { color: blue; }
401 </style>
402 </head>
403 <body>
404 <div id="header">
405 <h1>
406 git-show(1) Manual Page
407 </h1>
408 <h2>NAME</h2>
409 <div class="sectionbody">
410 <p>git-show -
411 Show various types of objects
412 </p>
413 </div>
414 </div>
415 <h2 id="_synopsis">SYNOPSIS</h2>
416 <div class="sectionbody">
417 <div class="paragraph"><p><em>git show</em> [options] &lt;object&gt;&#8230;</p></div>
418 </div>
419 <h2 id="_description">DESCRIPTION</h2>
420 <div class="sectionbody">
421 <div class="paragraph"><p>Shows one or more objects (blobs, trees, tags and commits).</p></div>
422 <div class="paragraph"><p>For commits it shows the log message and textual diff. It also
423 presents the merge commit in a special format as produced by
424 <em>git diff-tree --cc</em>.</p></div>
425 <div class="paragraph"><p>For tags, it shows the tag message and the referenced objects.</p></div>
426 <div class="paragraph"><p>For trees, it shows the names (equivalent to <em>git ls-tree</em>
427 with --name-only).</p></div>
428 <div class="paragraph"><p>For plain blobs, it shows the plain contents.</p></div>
429 <div class="paragraph"><p>The command takes options applicable to the <em>git diff-tree</em> command to
430 control how the changes the commit introduces are shown.</p></div>
431 <div class="paragraph"><p>This manual page describes only the most frequently used options.</p></div>
432 </div>
433 <h2 id="_options">OPTIONS</h2>
434 <div class="sectionbody">
435 <div class="dlist"><dl>
436 <dt class="hdlist1">
437 &lt;object&gt;&#8230;
438 </dt>
439 <dd>
441 The names of objects to show.
442 For a more complete list of ways to spell object names, see
443 "SPECIFYING REVISIONS" section in <a href="gitrevisions.html">gitrevisions(7)</a>.
444 </p>
445 </dd>
446 <dt class="hdlist1">
447 --pretty[=&lt;format&gt;]
448 </dt>
449 <dt class="hdlist1">
450 --format=&lt;format&gt;
451 </dt>
452 <dd>
454 Pretty-print the contents of the commit logs in a given format,
455 where <em>&lt;format&gt;</em> can be one of <em>oneline</em>, <em>short</em>, <em>medium</em>,
456 <em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em> and <em>format:&lt;string&gt;</em>. See
457 the "PRETTY FORMATS" section for some additional details for each
458 format. When omitted, the format defaults to <em>medium</em>.
459 </p>
460 <div class="paragraph"><p>Note: you can specify the default pretty format in the repository
461 configuration (see <a href="git-config.html">git-config(1)</a>).</p></div>
462 </dd>
463 <dt class="hdlist1">
464 --abbrev-commit
465 </dt>
466 <dd>
468 Instead of showing the full 40-byte hexadecimal commit object
469 name, show only a partial prefix. Non default number of
470 digits can be specified with "--abbrev=&lt;n&gt;" (which also modifies
471 diff output, if it is displayed).
472 </p>
473 <div class="paragraph"><p>This should make "--pretty=oneline" a whole lot more readable for
474 people using 80-column terminals.</p></div>
475 </dd>
476 <dt class="hdlist1">
477 --oneline
478 </dt>
479 <dd>
481 This is a shorthand for "--pretty=oneline --abbrev-commit"
482 used together.
483 </p>
484 </dd>
485 <dt class="hdlist1">
486 --encoding[=&lt;encoding&gt;]
487 </dt>
488 <dd>
490 The commit objects record the encoding used for the log message
491 in their encoding header; this option can be used to tell the
492 command to re-code the commit log message in the encoding
493 preferred by the user. For non plumbing commands this
494 defaults to UTF-8.
495 </p>
496 </dd>
497 <dt class="hdlist1">
498 --notes[=&lt;ref&gt;]
499 </dt>
500 <dd>
502 Show the notes (see <a href="git-notes.html">git-notes(1)</a>) that annotate the
503 commit, when showing the commit log message. This is the default
504 for <tt>git log</tt>, <tt>git show</tt> and <tt>git whatchanged</tt> commands when
505 there is no <tt>--pretty</tt>, <tt>--format</tt> nor <tt>--oneline</tt> option given
506 on the command line.
507 </p>
508 <div class="paragraph"><p>By default, the notes shown are from the notes refs listed in the
509 <em>core.notesRef</em> and <em>notes.displayRef</em> variables (or corresponding
510 environment overrides). See <a href="git-config.html">git-config(1)</a> for more details.</p></div>
511 <div class="paragraph"><p>With an optional <em>&lt;ref&gt;</em> argument, show this notes ref instead of the
512 default notes ref(s). The ref is taken to be in <tt>refs/notes/</tt> if it
513 is not qualified.</p></div>
514 <div class="paragraph"><p>Multiple --notes options can be combined to control which notes are
515 being displayed. Examples: "--notes=foo" will show only notes from
516 "refs/notes/foo"; "--notes=foo --notes" will show both notes from
517 "refs/notes/foo" and from the default notes ref(s).</p></div>
518 </dd>
519 <dt class="hdlist1">
520 --no-notes
521 </dt>
522 <dd>
524 Do not show notes. This negates the above <tt>--notes</tt> option, by
525 resetting the list of notes refs from which notes are shown.
526 Options are parsed in the order given on the command line, so e.g.
527 "--notes --notes=foo --no-notes --notes=bar" will only show notes
528 from "refs/notes/bar".
529 </p>
530 </dd>
531 <dt class="hdlist1">
532 --show-notes[=&lt;ref&gt;]
533 </dt>
534 <dt class="hdlist1">
535 --[no-]standard-notes
536 </dt>
537 <dd>
539 These options are deprecated. Use the above --notes/--no-notes
540 options instead.
541 </p>
542 </dd>
543 </dl></div>
544 </div>
545 <h2 id="_pretty_formats">PRETTY FORMATS</h2>
546 <div class="sectionbody">
547 <div class="paragraph"><p>If the commit is a merge, and if the pretty-format
548 is not <em>oneline</em>, <em>email</em> or <em>raw</em>, an additional line is
549 inserted before the <em>Author:</em> line. This line begins with
550 "Merge: " and the sha1s of ancestral commits are printed,
551 separated by spaces. Note that the listed commits may not
552 necessarily be the list of the <strong>direct</strong> parent commits if you
553 have limited your view of history: for example, if you are
554 only interested in changes related to a certain directory or
555 file.</p></div>
556 <div class="paragraph"><p>There are several built-in formats, and you can define
557 additional formats by setting a pretty.&lt;name&gt;
558 config option to either another format name, or a
559 <em>format:</em> string, as described below (see
560 <a href="git-config.html">git-config(1)</a>). Here are the details of the
561 built-in formats:</p></div>
562 <div class="ulist"><ul>
563 <li>
565 <em>oneline</em>
566 </p>
567 <div class="literalblock">
568 <div class="content">
569 <pre><tt>&lt;sha1&gt; &lt;title line&gt;</tt></pre>
570 </div></div>
571 <div class="paragraph"><p>This is designed to be as compact as possible.</p></div>
572 </li>
573 <li>
575 <em>short</em>
576 </p>
577 <div class="literalblock">
578 <div class="content">
579 <pre><tt>commit &lt;sha1&gt;
580 Author: &lt;author&gt;</tt></pre>
581 </div></div>
582 <div class="literalblock">
583 <div class="content">
584 <pre><tt>&lt;title line&gt;</tt></pre>
585 </div></div>
586 </li>
587 <li>
589 <em>medium</em>
590 </p>
591 <div class="literalblock">
592 <div class="content">
593 <pre><tt>commit &lt;sha1&gt;
594 Author: &lt;author&gt;
595 Date: &lt;author date&gt;</tt></pre>
596 </div></div>
597 <div class="literalblock">
598 <div class="content">
599 <pre><tt>&lt;title line&gt;</tt></pre>
600 </div></div>
601 <div class="literalblock">
602 <div class="content">
603 <pre><tt>&lt;full commit message&gt;</tt></pre>
604 </div></div>
605 </li>
606 <li>
608 <em>full</em>
609 </p>
610 <div class="literalblock">
611 <div class="content">
612 <pre><tt>commit &lt;sha1&gt;
613 Author: &lt;author&gt;
614 Commit: &lt;committer&gt;</tt></pre>
615 </div></div>
616 <div class="literalblock">
617 <div class="content">
618 <pre><tt>&lt;title line&gt;</tt></pre>
619 </div></div>
620 <div class="literalblock">
621 <div class="content">
622 <pre><tt>&lt;full commit message&gt;</tt></pre>
623 </div></div>
624 </li>
625 <li>
627 <em>fuller</em>
628 </p>
629 <div class="literalblock">
630 <div class="content">
631 <pre><tt>commit &lt;sha1&gt;
632 Author: &lt;author&gt;
633 AuthorDate: &lt;author date&gt;
634 Commit: &lt;committer&gt;
635 CommitDate: &lt;committer date&gt;</tt></pre>
636 </div></div>
637 <div class="literalblock">
638 <div class="content">
639 <pre><tt>&lt;title line&gt;</tt></pre>
640 </div></div>
641 <div class="literalblock">
642 <div class="content">
643 <pre><tt>&lt;full commit message&gt;</tt></pre>
644 </div></div>
645 </li>
646 <li>
648 <em>email</em>
649 </p>
650 <div class="literalblock">
651 <div class="content">
652 <pre><tt>From &lt;sha1&gt; &lt;date&gt;
653 From: &lt;author&gt;
654 Date: &lt;author date&gt;
655 Subject: [PATCH] &lt;title line&gt;</tt></pre>
656 </div></div>
657 <div class="literalblock">
658 <div class="content">
659 <pre><tt>&lt;full commit message&gt;</tt></pre>
660 </div></div>
661 </li>
662 <li>
664 <em>raw</em>
665 </p>
666 <div class="paragraph"><p>The <em>raw</em> format shows the entire commit exactly as
667 stored in the commit object. Notably, the SHA1s are
668 displayed in full, regardless of whether --abbrev or
669 --no-abbrev are used, and <em>parents</em> information show the
670 true parent commits, without taking grafts nor history
671 simplification into account.</p></div>
672 </li>
673 <li>
675 <em>format:&lt;string&gt;</em>
676 </p>
677 <div class="paragraph"><p>The <em>format:&lt;string&gt;</em> format allows you to specify which information
678 you want to show. It works a little bit like printf format,
679 with the notable exception that you get a newline with <em>%n</em>
680 instead of <em>\n</em>.</p></div>
681 <div class="paragraph"><p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was &gt;&gt;%s&lt;&lt;%n"</em>
682 would show something like this:</p></div>
683 <div class="listingblock">
684 <div class="content">
685 <pre><tt>The author of fe6e0ee was Junio C Hamano, 23 hours ago
686 The title was &gt;&gt;t4119: test autocomputing -p&lt;n&gt; for traditional diff input.&lt;&lt;</tt></pre>
687 </div></div>
688 <div class="paragraph"><p>The placeholders are:</p></div>
689 <div class="ulist"><ul>
690 <li>
692 <em>%H</em>: commit hash
693 </p>
694 </li>
695 <li>
697 <em>%h</em>: abbreviated commit hash
698 </p>
699 </li>
700 <li>
702 <em>%T</em>: tree hash
703 </p>
704 </li>
705 <li>
707 <em>%t</em>: abbreviated tree hash
708 </p>
709 </li>
710 <li>
712 <em>%P</em>: parent hashes
713 </p>
714 </li>
715 <li>
717 <em>%p</em>: abbreviated parent hashes
718 </p>
719 </li>
720 <li>
722 <em>%an</em>: author name
723 </p>
724 </li>
725 <li>
727 <em>%aN</em>: author name (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
728 </p>
729 </li>
730 <li>
732 <em>%ae</em>: author email
733 </p>
734 </li>
735 <li>
737 <em>%aE</em>: author email (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
738 </p>
739 </li>
740 <li>
742 <em>%ad</em>: author date (format respects --date= option)
743 </p>
744 </li>
745 <li>
747 <em>%aD</em>: author date, RFC2822 style
748 </p>
749 </li>
750 <li>
752 <em>%ar</em>: author date, relative
753 </p>
754 </li>
755 <li>
757 <em>%at</em>: author date, UNIX timestamp
758 </p>
759 </li>
760 <li>
762 <em>%ai</em>: author date, ISO 8601 format
763 </p>
764 </li>
765 <li>
767 <em>%cn</em>: committer name
768 </p>
769 </li>
770 <li>
772 <em>%cN</em>: committer name (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
773 </p>
774 </li>
775 <li>
777 <em>%ce</em>: committer email
778 </p>
779 </li>
780 <li>
782 <em>%cE</em>: committer email (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
783 </p>
784 </li>
785 <li>
787 <em>%cd</em>: committer date
788 </p>
789 </li>
790 <li>
792 <em>%cD</em>: committer date, RFC2822 style
793 </p>
794 </li>
795 <li>
797 <em>%cr</em>: committer date, relative
798 </p>
799 </li>
800 <li>
802 <em>%ct</em>: committer date, UNIX timestamp
803 </p>
804 </li>
805 <li>
807 <em>%ci</em>: committer date, ISO 8601 format
808 </p>
809 </li>
810 <li>
812 <em>%d</em>: ref names, like the --decorate option of <a href="git-log.html">git-log(1)</a>
813 </p>
814 </li>
815 <li>
817 <em>%e</em>: encoding
818 </p>
819 </li>
820 <li>
822 <em>%s</em>: subject
823 </p>
824 </li>
825 <li>
827 <em>%f</em>: sanitized subject line, suitable for a filename
828 </p>
829 </li>
830 <li>
832 <em>%b</em>: body
833 </p>
834 </li>
835 <li>
837 <em>%B</em>: raw body (unwrapped subject and body)
838 </p>
839 </li>
840 <li>
842 <em>%N</em>: commit notes
843 </p>
844 </li>
845 <li>
847 <em>%gD</em>: reflog selector, e.g., <tt>refs/stash@{1}</tt>
848 </p>
849 </li>
850 <li>
852 <em>%gd</em>: shortened reflog selector, e.g., <tt>stash@{1}</tt>
853 </p>
854 </li>
855 <li>
857 <em>%gs</em>: reflog subject
858 </p>
859 </li>
860 <li>
862 <em>%Cred</em>: switch color to red
863 </p>
864 </li>
865 <li>
867 <em>%Cgreen</em>: switch color to green
868 </p>
869 </li>
870 <li>
872 <em>%Cblue</em>: switch color to blue
873 </p>
874 </li>
875 <li>
877 <em>%Creset</em>: reset color
878 </p>
879 </li>
880 <li>
882 <em>%C(&#8230;)</em>: color specification, as described in color.branch.* config option
883 </p>
884 </li>
885 <li>
887 <em>%m</em>: left, right or boundary mark
888 </p>
889 </li>
890 <li>
892 <em>%n</em>: newline
893 </p>
894 </li>
895 <li>
897 <em>%%</em>: a raw <em>%</em>
898 </p>
899 </li>
900 <li>
902 <em>%x00</em>: print a byte from a hex code
903 </p>
904 </li>
905 <li>
907 <em>%w([&lt;w&gt;[,&lt;i1&gt;[,&lt;i2&gt;]]])</em>: switch line wrapping, like the -w option of
908 <a href="git-shortlog.html">git-shortlog(1)</a>.
909 </p>
910 </li>
911 </ul></div>
912 </li>
913 </ul></div>
914 <div class="admonitionblock">
915 <table><tr>
916 <td class="icon">
917 <div class="title">Note</div>
918 </td>
919 <td class="content">Some placeholders may depend on other options given to the
920 revision traversal engine. For example, the <tt>%g*</tt> reflog options will
921 insert an empty string unless we are traversing reflog entries (e.g., by
922 <tt>git log -g</tt>). The <tt>%d</tt> placeholder will use the "short" decoration
923 format if <tt>--decorate</tt> was not already provided on the command line.</td>
924 </tr></table>
925 </div>
926 <div class="paragraph"><p>If you add a <tt>&#43;</tt> (plus sign) after <em>%</em> of a placeholder, a line-feed
927 is inserted immediately before the expansion if and only if the
928 placeholder expands to a non-empty string.</p></div>
929 <div class="paragraph"><p>If you add a <tt>-</tt> (minus sign) after <em>%</em> of a placeholder, line-feeds that
930 immediately precede the expansion are deleted if and only if the
931 placeholder expands to an empty string.</p></div>
932 <div class="paragraph"><p>If you add a ` ` (space) after <em>%</em> of a placeholder, a space
933 is inserted immediately before the expansion if and only if the
934 placeholder expands to a non-empty string.</p></div>
935 <div class="ulist"><ul>
936 <li>
938 <em>tformat:</em>
939 </p>
940 <div class="paragraph"><p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it
941 provides "terminator" semantics instead of "separator" semantics. In
942 other words, each commit has the message terminator character (usually a
943 newline) appended, rather than a separator placed between entries.
944 This means that the final entry of a single-line format will be properly
945 terminated with a new line, just as the "oneline" format does.
946 For example:</p></div>
947 <div class="listingblock">
948 <div class="content">
949 <pre><tt>$ git log -2 --pretty=format:%h 4da45bef \
950 | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
951 4da45be
952 7134973 -- NO NEWLINE
954 $ git log -2 --pretty=tformat:%h 4da45bef \
955 | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
956 4da45be
957 7134973</tt></pre>
958 </div></div>
959 <div class="paragraph"><p>In addition, any unrecognized string that has a <tt>%</tt> in it is interpreted
960 as if it has <tt>tformat:</tt> in front of it. For example, these two are
961 equivalent:</p></div>
962 <div class="listingblock">
963 <div class="content">
964 <pre><tt>$ git log -2 --pretty=tformat:%h 4da45bef
965 $ git log -2 --pretty=%h 4da45bef</tt></pre>
966 </div></div>
967 </li>
968 </ul></div>
969 </div>
970 <h2 id="_examples">EXAMPLES</h2>
971 <div class="sectionbody">
972 <div class="dlist"><dl>
973 <dt class="hdlist1">
974 git show v1.0.0
975 </dt>
976 <dd>
978 Shows the tag <tt>v1.0.0</tt>, along with the object the tags
979 points at.
980 </p>
981 </dd>
982 <dt class="hdlist1">
983 git show v1.0.0^{tree}
984 </dt>
985 <dd>
987 Shows the tree pointed to by the tag <tt>v1.0.0</tt>.
988 </p>
989 </dd>
990 <dt class="hdlist1">
991 git show -s --format=%s v1.0.0^{commit}
992 </dt>
993 <dd>
995 Shows the subject of the commit pointed to by the
996 tag <tt>v1.0.0</tt>.
997 </p>
998 </dd>
999 <dt class="hdlist1">
1000 git show next~10:Documentation/README
1001 </dt>
1002 <dd>
1004 Shows the contents of the file <tt>Documentation/README</tt> as
1005 they were current in the 10th last commit of the branch
1006 <tt>next</tt>.
1007 </p>
1008 </dd>
1009 <dt class="hdlist1">
1010 git show master:Makefile master:t/Makefile
1011 </dt>
1012 <dd>
1014 Concatenates the contents of said Makefiles in the head
1015 of the branch <tt>master</tt>.
1016 </p>
1017 </dd>
1018 </dl></div>
1019 </div>
1020 <h2 id="_discussion">Discussion</h2>
1021 <div class="sectionbody">
1022 <div class="paragraph"><p>At the core level, git is character encoding agnostic.</p></div>
1023 <div class="ulist"><ul>
1024 <li>
1026 The pathnames recorded in the index and in the tree objects
1027 are treated as uninterpreted sequences of non-NUL bytes.
1028 What readdir(2) returns are what are recorded and compared
1029 with the data git keeps track of, which in turn are expected
1030 to be what lstat(2) and creat(2) accepts. There is no such
1031 thing as pathname encoding translation.
1032 </p>
1033 </li>
1034 <li>
1036 The contents of the blob objects are uninterpreted sequences
1037 of bytes. There is no encoding translation at the core
1038 level.
1039 </p>
1040 </li>
1041 <li>
1043 The commit log messages are uninterpreted sequences of non-NUL
1044 bytes.
1045 </p>
1046 </li>
1047 </ul></div>
1048 <div class="paragraph"><p>Although we encourage that the commit log messages are encoded
1049 in UTF-8, both the core and git Porcelain are designed not to
1050 force UTF-8 on projects. If all participants of a particular
1051 project find it more convenient to use legacy encodings, git
1052 does not forbid it. However, there are a few things to keep in
1053 mind.</p></div>
1054 <div class="olist arabic"><ol class="arabic">
1055 <li>
1057 <em>git commit</em> and <em>git commit-tree</em> issues
1058 a warning if the commit log message given to it does not look
1059 like a valid UTF-8 string, unless you explicitly say your
1060 project uses a legacy encoding. The way to say this is to
1061 have i18n.commitencoding in <tt>.git/config</tt> file, like this:
1062 </p>
1063 <div class="listingblock">
1064 <div class="content">
1065 <pre><tt>[i18n]
1066 commitencoding = ISO-8859-1</tt></pre>
1067 </div></div>
1068 <div class="paragraph"><p>Commit objects created with the above setting record the value
1069 of <tt>i18n.commitencoding</tt> in its <tt>encoding</tt> header. This is to
1070 help other people who look at them later. Lack of this header
1071 implies that the commit log message is encoded in UTF-8.</p></div>
1072 </li>
1073 <li>
1075 <em>git log</em>, <em>git show</em>, <em>git blame</em> and friends look at the
1076 <tt>encoding</tt> header of a commit object, and try to re-code the
1077 log message into UTF-8 unless otherwise specified. You can
1078 specify the desired output encoding with
1079 <tt>i18n.logoutputencoding</tt> in <tt>.git/config</tt> file, like this:
1080 </p>
1081 <div class="listingblock">
1082 <div class="content">
1083 <pre><tt>[i18n]
1084 logoutputencoding = ISO-8859-1</tt></pre>
1085 </div></div>
1086 <div class="paragraph"><p>If you do not have this configuration variable, the value of
1087 <tt>i18n.commitencoding</tt> is used instead.</p></div>
1088 </li>
1089 </ol></div>
1090 <div class="paragraph"><p>Note that we deliberately chose not to re-code the commit log
1091 message when a commit is made to force UTF-8 at the commit
1092 object level, because re-coding to UTF-8 is not necessarily a
1093 reversible operation.</p></div>
1094 </div>
1095 <h2 id="_git">GIT</h2>
1096 <div class="sectionbody">
1097 <div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
1098 </div>
1099 <div id="footer">
1100 <div id="footer-text">
1101 Last updated 2011-03-15 23:30:14 UTC
1102 </div>
1103 </div>
1104 </body>
1105 </html>