Google Git
Sign in
chromium / external / gitster / git-htmldocs / bca4cd67b31ff555a6fff228e094f1d44b1a8306 / . / gitrevisions.html
blob: 24f454158212b8b966c7200c38e977e2bc8d5bfc [file] [log] [blame]
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]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>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]5<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
6<meta name="generator" content="AsciiDoc 8.6.8" />
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]7<title>gitrevisions(7)</title>
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]8<style type="text/css">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]9/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
10
11/* Default font. */
12body {
13 font-family: Georgia,serif;
14}
15
16/* Title font. */
17h1, h2, h3, h4, h5, h6,
18div.title, caption.title,
19thead, p.table.header,
20#toctitle,
21#author, #revnumber, #revdate, #revremark,
22#footer {
23 font-family: Arial,Helvetica,sans-serif;
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]24}
25
26body {
27 margin: 1em 5% 1em 5%;
28}
29
30a {
31 color: blue;
32 text-decoration: underline;
33}
34a:visited {
35 color: fuchsia;
36}
37
38em {
39 font-style: italic;
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]40 color: navy;
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]41}
42
43strong {
44 font-weight: bold;
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]45 color: #083194;
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]46}
47
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]48h1, h2, h3, h4, h5, h6 {
49 color: #527bbd;
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]50 margin-top: 1.2em;
51 margin-bottom: 0.5em;
52 line-height: 1.3;
53}
54
55h1, h2, h3 {
56 border-bottom: 2px solid silver;
57}
58h2 {
59 padding-top: 0.5em;
60}
61h3 {
62 float: left;
63}
64h3 + * {
65 clear: left;
66}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]67h5 {
68 font-size: 1.0em;
69}
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]70
71div.sectionbody {
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]72 margin-left: 0;
73}
74
75hr {
76 border: 1px solid silver;
77}
78
79p {
80 margin-top: 0.5em;
81 margin-bottom: 0.5em;
82}
83
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]84ul, ol, li > p {
85 margin-top: 0;
86}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]87ul > li { color: #aaa; }
88ul > li > * { color: black; }
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]89
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]90.monospaced, code, pre {
91 font-family: "Courier New", Courier, monospace;
92 font-size: inherit;
93 color: navy;
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]94 padding: 0;
95 margin: 0;
96}
97
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]98
99#author {
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]100 color: #527bbd;
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]101 font-weight: bold;
102 font-size: 1.1em;
103}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]104#email {
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]105}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]106#revnumber, #revdate, #revremark {
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]107}
108
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]109#footer {
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]110 font-size: small;
111 border-top: 2px solid silver;
112 padding-top: 0.5em;
113 margin-top: 4.0em;
114}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]115#footer-text {
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]116 float: left;
117 padding-bottom: 0.5em;
118}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]119#footer-badges {
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]120 float: right;
121 padding-bottom: 0.5em;
122}
123
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]124#preamble {
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]125 margin-top: 1.5em;
126 margin-bottom: 1.5em;
127}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]128div.imageblock, div.exampleblock, div.verseblock,
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]129div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
130div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]131 margin-top: 1.0em;
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]132 margin-bottom: 1.5em;
133}
134div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]135 margin-top: 2.0em;
136 margin-bottom: 2.0em;
137 margin-right: 10%;
138 color: #606060;
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]139}
140
141div.content { /* Block element content. */
142 padding: 0;
143}
144
145/* Block element titles. */
146div.title, caption.title {
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]147 color: #527bbd;
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]148 font-weight: bold;
149 text-align: left;
150 margin-top: 1.0em;
151 margin-bottom: 0.5em;
152}
153div.title + * {
154 margin-top: 0;
155}
156
157td div.title:first-child {
158 margin-top: 0.0em;
159}
160div.content div.title:first-child {
161 margin-top: 0.0em;
162}
163div.content + div.title {
164 margin-top: 0.0em;
165}
166
167div.sidebarblock > div.content {
168 background: #ffffee;
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]169 border: 1px solid #dddddd;
170 border-left: 4px solid #f0f0f0;
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]171 padding: 0.5em;
172}
173
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]174div.listingblock > div.content {
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]175 border: 1px solid #dddddd;
176 border-left: 5px solid #f0f0f0;
177 background: #f8f8f8;
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]178 padding: 0.5em;
179}
180
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]181div.quoteblock, div.verseblock {
182 padding-left: 1.0em;
183 margin-left: 1.0em;
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]184 margin-right: 10%;
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]185 border-left: 5px solid #f0f0f0;
186 color: #888;
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]187}
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]188
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]189div.quoteblock > div.attribution {
190 padding-top: 0.5em;
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]191 text-align: right;
192}
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]193
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]194div.verseblock > pre.content {
195 font-family: inherit;
196 font-size: inherit;
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]197}
198div.verseblock > div.attribution {
199 padding-top: 0.75em;
200 text-align: left;
201}
202/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]203div.verseblock + div.attribution {
204 text-align: left;
205}
206
207div.admonitionblock .icon {
208 vertical-align: top;
209 font-size: 1.1em;
210 font-weight: bold;
211 text-decoration: underline;
212 color: #527bbd;
213 padding-right: 0.5em;
214}
215div.admonitionblock td.content {
216 padding-left: 0.5em;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]217 border-left: 3px solid #dddddd;
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]218}
219
220div.exampleblock > div.content {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]221 border-left: 3px solid #dddddd;
222 padding-left: 0.5em;
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]223}
224
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]225div.imageblock div.content { padding-left: 0; }
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]226span.image img { border-style: none; }
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]227a.image:visited { color: white; }
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]228
229dl {
230 margin-top: 0.8em;
231 margin-bottom: 0.8em;
232}
233dt {
234 margin-top: 0.5em;
235 margin-bottom: 0;
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]236 font-style: normal;
237 color: navy;
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]238}
239dd > *:first-child {
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]240 margin-top: 0.1em;
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]241}
242
243ul, ol {
244 list-style-position: outside;
245}
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]246ol.arabic {
247 list-style-type: decimal;
248}
249ol.loweralpha {
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]250 list-style-type: lower-alpha;
251}
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]252ol.upperalpha {
253 list-style-type: upper-alpha;
254}
255ol.lowerroman {
256 list-style-type: lower-roman;
257}
258ol.upperroman {
259 list-style-type: upper-roman;
260}
261
262div.compact ul, div.compact ol,
263div.compact p, div.compact p,
264div.compact div, div.compact div {
265 margin-top: 0.1em;
266 margin-bottom: 0.1em;
267}
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]268
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]269tfoot {
270 font-weight: bold;
271}
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]272td > div.verse {
273 white-space: pre;
274}
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]275
276div.hdlist {
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]277 margin-top: 0.8em;
278 margin-bottom: 0.8em;
279}
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]280div.hdlist tr {
281 padding-bottom: 15px;
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]282}
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]283dt.hdlist1.strong, td.hdlist1.strong {
284 font-weight: bold;
285}
286td.hdlist1 {
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]287 vertical-align: top;
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]288 font-style: normal;
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]289 padding-right: 0.8em;
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]290 color: navy;
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]291}
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]292td.hdlist2 {
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]293 vertical-align: top;
294}
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]295div.hdlist.compact tr {
296 margin: 0;
297 padding-bottom: 0;
298}
299
300.comment {
301 background: yellow;
302}
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]303
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]304.footnote, .footnoteref {
305 font-size: 0.8em;
306}
307
308span.footnote, span.footnoteref {
309 vertical-align: super;
310}
311
312#footnotes {
313 margin: 20px 0 20px 0;
314 padding: 7px 0 0 0;
315}
316
317#footnotes div.footnote {
318 margin: 0 0 5px 0;
319}
320
321#footnotes hr {
322 border: none;
323 border-top: 1px solid silver;
324 height: 1px;
325 text-align: left;
326 margin-left: 0;
327 width: 20%;
328 min-width: 100px;
329}
330
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]331div.colist td {
332 padding-right: 0.5em;
333 padding-bottom: 0.3em;
334 vertical-align: top;
335}
336div.colist td img {
337 margin-top: 0.3em;
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]338}
339
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]340@media print {
341 #footer-badges { display: none; }
342}
343
344#toc {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]345 margin-bottom: 2.5em;
346}
347
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]348#toctitle {
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]349 color: #527bbd;
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]350 font-size: 1.1em;
351 font-weight: bold;
352 margin-top: 1.0em;
353 margin-bottom: 0.1em;
354}
355
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]356div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]357 margin-top: 0;
358 margin-bottom: 0;
359}
360div.toclevel2 {
361 margin-left: 2em;
362 font-size: 0.9em;
363}
364div.toclevel3 {
365 margin-left: 4em;
366 font-size: 0.9em;
367}
368div.toclevel4 {
369 margin-left: 6em;
370 font-size: 0.9em;
371}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]372
373span.aqua { color: aqua; }
374span.black { color: black; }
375span.blue { color: blue; }
376span.fuchsia { color: fuchsia; }
377span.gray { color: gray; }
378span.green { color: green; }
379span.lime { color: lime; }
380span.maroon { color: maroon; }
381span.navy { color: navy; }
382span.olive { color: olive; }
383span.purple { color: purple; }
384span.red { color: red; }
385span.silver { color: silver; }
386span.teal { color: teal; }
387span.white { color: white; }
388span.yellow { color: yellow; }
389
390span.aqua-background { background: aqua; }
391span.black-background { background: black; }
392span.blue-background { background: blue; }
393span.fuchsia-background { background: fuchsia; }
394span.gray-background { background: gray; }
395span.green-background { background: green; }
396span.lime-background { background: lime; }
397span.maroon-background { background: maroon; }
398span.navy-background { background: navy; }
399span.olive-background { background: olive; }
400span.purple-background { background: purple; }
401span.red-background { background: red; }
402span.silver-background { background: silver; }
403span.teal-background { background: teal; }
404span.white-background { background: white; }
405span.yellow-background { background: yellow; }
406
407span.big { font-size: 2em; }
408span.small { font-size: 0.6em; }
409
410span.underline { text-decoration: underline; }
411span.overline { text-decoration: overline; }
412span.line-through { text-decoration: line-through; }
413
414div.unbreakable { page-break-inside: avoid; }
415
416
417/*
418 * xhtml11 specific
419 *
420 * */
421
422div.tableblock {
423 margin-top: 1.0em;
424 margin-bottom: 1.5em;
425}
426div.tableblock > table {
427 border: 3px solid #527bbd;
428}
429thead, p.table.header {
430 font-weight: bold;
431 color: #527bbd;
432}
433p.table {
434 margin-top: 0;
435}
436/* Because the table frame attribute is overriden by CSS in most browsers. */
437div.tableblock > table[frame="void"] {
438 border-style: none;
439}
440div.tableblock > table[frame="hsides"] {
441 border-left-style: none;
442 border-right-style: none;
443}
444div.tableblock > table[frame="vsides"] {
445 border-top-style: none;
446 border-bottom-style: none;
447}
448
449
450/*
451 * html5 specific
452 *
453 * */
454
455table.tableblock {
456 margin-top: 1.0em;
457 margin-bottom: 1.5em;
458}
459thead, p.tableblock.header {
460 font-weight: bold;
461 color: #527bbd;
462}
463p.tableblock {
464 margin-top: 0;
465}
466table.tableblock {
467 border-width: 3px;
468 border-spacing: 0px;
469 border-style: solid;
470 border-color: #527bbd;
471 border-collapse: collapse;
472}
473th.tableblock, td.tableblock {
474 border-width: 1px;
475 padding: 4px;
476 border-style: solid;
477 border-color: #527bbd;
478}
479
480table.tableblock.frame-topbot {
481 border-left-style: hidden;
482 border-right-style: hidden;
483}
484table.tableblock.frame-sides {
485 border-top-style: hidden;
486 border-bottom-style: hidden;
487}
488table.tableblock.frame-none {
489 border-style: hidden;
490}
491
492th.tableblock.halign-left, td.tableblock.halign-left {
493 text-align: left;
494}
495th.tableblock.halign-center, td.tableblock.halign-center {
496 text-align: center;
497}
498th.tableblock.halign-right, td.tableblock.halign-right {
499 text-align: right;
500}
501
502th.tableblock.valign-top, td.tableblock.valign-top {
503 vertical-align: top;
504}
505th.tableblock.valign-middle, td.tableblock.valign-middle {
506 vertical-align: middle;
507}
508th.tableblock.valign-bottom, td.tableblock.valign-bottom {
509 vertical-align: bottom;
510}
511
512
513/*
514 * manpage specific
515 *
516 * */
517
518body.manpage h1 {
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]519 padding-top: 0.5em;
520 padding-bottom: 0.5em;
521 border-top: 2px solid silver;
522 border-bottom: 2px solid silver;
523}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]524body.manpage h2 {
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]525 border-style: none;
526}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]527body.manpage div.sectionbody {
528 margin-left: 3em;
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]529}
530
531@media print {
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]532 body.manpage div#toc { display: none; }
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]533}
534
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]535
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]536</style>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]537<script type="text/javascript">
538/*<![CDATA[*/
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]539var asciidoc = { // Namespace.
540
541/////////////////////////////////////////////////////////////////////
542// Table Of Contents generator
543/////////////////////////////////////////////////////////////////////
544
545/* Author: Mihai Bazon, September 2002
546 * http://students.infoiasi.ro/~mishoo
547 *
548 * Table Of Content generator
549 * Version: 0.4
550 *
551 * Feel free to use this script under the terms of the GNU General Public
552 * License, as long as you do not remove or alter this notice.
553 */
554
555 /* modified by Troy D. Hanson, September 2006. License: GPL */
556 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
557
558// toclevels = 1..4.
559toc: function (toclevels) {
560
561 function getText(el) {
562 var text = "";
563 for (var i = el.firstChild; i != null; i = i.nextSibling) {
564 if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
565 text += i.data;
566 else if (i.firstChild != null)
567 text += getText(i);
568 }
569 return text;
570 }
571
572 function TocEntry(el, text, toclevel) {
573 this.element = el;
574 this.text = text;
575 this.toclevel = toclevel;
576 }
577
578 function tocEntries(el, toclevels) {
579 var result = new Array;
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]580 var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]581 // Function that scans the DOM tree for header elements (the DOM2
582 // nodeIterator API would be a better technique but not supported by all
583 // browsers).
584 var iterate = function (el) {
585 for (var i = el.firstChild; i != null; i = i.nextSibling) {
586 if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
587 var mo = re.exec(i.tagName);
588 if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
589 result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
590 }
591 iterate(i);
592 }
593 }
594 }
595 iterate(el);
596 return result;
597 }
598
599 var toc = document.getElementById("toc");
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]600 if (!toc) {
601 return;
602 }
603
604 // Delete existing TOC entries in case we're reloading the TOC.
605 var tocEntriesToRemove = [];
606 var i;
607 for (i = 0; i < toc.childNodes.length; i++) {
608 var entry = toc.childNodes[i];
609 if (entry.nodeName.toLowerCase() == 'div'
610 && entry.getAttribute("class")
611 && entry.getAttribute("class").match(/^toclevel/))
612 tocEntriesToRemove.push(entry);
613 }
614 for (i = 0; i < tocEntriesToRemove.length; i++) {
615 toc.removeChild(tocEntriesToRemove[i]);
616 }
617
618 // Rebuild TOC entries.
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]619 var entries = tocEntries(document.getElementById("content"), toclevels);
620 for (var i = 0; i < entries.length; ++i) {
621 var entry = entries[i];
622 if (entry.element.id == "")
623 entry.element.id = "_toc_" + i;
624 var a = document.createElement("a");
625 a.href = "#" + entry.element.id;
626 a.appendChild(document.createTextNode(entry.text));
627 var div = document.createElement("div");
628 div.appendChild(a);
629 div.className = "toclevel" + entry.toclevel;
630 toc.appendChild(div);
631 }
632 if (entries.length == 0)
633 toc.parentNode.removeChild(toc);
634},
635
636
637/////////////////////////////////////////////////////////////////////
638// Footnotes generator
639/////////////////////////////////////////////////////////////////////
640
641/* Based on footnote generation code from:
642 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
643 */
644
645footnotes: function () {
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]646 // Delete existing footnote entries in case we're reloading the footnodes.
647 var i;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]648 var noteholder = document.getElementById("footnotes");
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]649 if (!noteholder) {
650 return;
651 }
652 var entriesToRemove = [];
653 for (i = 0; i < noteholder.childNodes.length; i++) {
654 var entry = noteholder.childNodes[i];
655 if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
656 entriesToRemove.push(entry);
657 }
658 for (i = 0; i < entriesToRemove.length; i++) {
659 noteholder.removeChild(entriesToRemove[i]);
660 }
661
662 // Rebuild footnote entries.
663 var cont = document.getElementById("content");
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]664 var spans = cont.getElementsByTagName("span");
665 var refs = {};
666 var n = 0;
667 for (i=0; i<spans.length; i++) {
668 if (spans[i].className == "footnote") {
669 n++;
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]670 var note = spans[i].getAttribute("data-note");
671 if (!note) {
672 // Use [\s\S] in place of . so multi-line matches work.
673 // Because JavaScript has no s (dotall) regex flag.
674 note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
675 spans[i].innerHTML =
676 "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
677 "' title='View footnote' class='footnote'>" + n + "</a>]";
678 spans[i].setAttribute("data-note", note);
679 }
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]680 noteholder.innerHTML +=
681 "<div class='footnote' id='_footnote_" + n + "'>" +
682 "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
683 n + "</a>. " + note + "</div>";
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]684 var id =spans[i].getAttribute("id");
685 if (id != null) refs["#"+id] = n;
686 }
687 }
688 if (n == 0)
689 noteholder.parentNode.removeChild(noteholder);
690 else {
691 // Process footnoterefs.
692 for (i=0; i<spans.length; i++) {
693 if (spans[i].className == "footnoteref") {
694 var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
695 href = href.match(/#.*/)[0]; // Because IE return full URL.
696 n = refs[href];
697 spans[i].innerHTML =
698 "[<a href='#_footnote_" + n +
699 "' title='View footnote' class='footnote'>" + n + "</a>]";
700 }
701 }
702 }
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]703},
704
705install: function(toclevels) {
706 var timerId;
707
708 function reinstall() {
709 asciidoc.footnotes();
710 if (toclevels) {
711 asciidoc.toc(toclevels);
712 }
713 }
714
715 function reinstallAndRemoveTimer() {
716 clearInterval(timerId);
717 reinstall();
718 }
719
720 timerId = setInterval(reinstall, 500);
721 if (document.addEventListener)
722 document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
723 else
724 window.onload = reinstallAndRemoveTimer;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]725}
726
727}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]728asciidoc.install();
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]729/*]]>*/
730</script>
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]731</head>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]732<body class="manpage">
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]733<div id="header">
734<h1>
735gitrevisions(7) Manual Page
736</h1>
737<h2>NAME</h2>
738<div class="sectionbody">
739<p>gitrevisions -
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]740 specifying revisions and ranges for Git
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]741</p>
742</div>
743</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]744<div id="content">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]745<div class="sect1">
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]746<h2 id="_synopsis">SYNOPSIS</h2>
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]747<div class="sectionbody">
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]748<div class="paragraph"><p>gitrevisions</p></div>
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]749</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]750</div>
751<div class="sect1">
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]752<h2 id="_description">DESCRIPTION</h2>
753<div class="sectionbody">
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]754<div class="paragraph"><p>Many Git commands take revision parameters as arguments. Depending on
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]755the command, they denote a specific commit or, for commands which
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]756walk the revision graph (such as <a href="git-log.html">git-log(1)</a>), all commits which can
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]757be reached from that commit. In the latter case one can also specify a
758range of revisions explicitly.</p></div>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]759<div class="paragraph"><p>In addition, some Git commands (such as <a href="git-show.html">git-show(1)</a>) also take
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]760revision parameters which denote other objects than commits, e.g. blobs
761("files") or trees ("directories of files").</p></div>
762</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]763</div>
764<div class="sect1">
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]765<h2 id="_specifying_revisions">SPECIFYING REVISIONS</h2>
766<div class="sectionbody">
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]767<div class="paragraph"><p>A revision parameter <em>&lt;rev&gt;</em> typically, but not necessarily, names a
768commit object. It uses what is called an <em>extended SHA1</em>
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]769syntax. Here are various ways to spell object names. The
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]770ones listed near the end of this list name trees and
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]771blobs contained in a commit.</p></div>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]772<div class="dlist"><dl>
773<dt class="hdlist1">
774<em>&lt;sha1&gt;</em>, e.g. <em>dae86e1950b1277e545cee180551750029cfe735</em>, <em>dae86e</em>
775</dt>
776<dd>
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]777<p>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]778 The full SHA1 object name (40-byte hexadecimal string), or
779 a leading substring that is unique within the repository.
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]780 E.g. dae86e1950b1277e545cee180551750029cfe735 and dae86e both
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]781 name the same commit object if there is no other object in
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]782 your repository whose object name starts with dae86e.
783</p>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]784</dd>
785<dt class="hdlist1">
786<em>&lt;describeOutput&gt;</em>, e.g. <em>v1.7.4.2-679-g3bee7fb</em>
787</dt>
788<dd>
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]789<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]790 Output from <code>git describe</code>; i.e. a closest tag, optionally
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]791 followed by a dash and a number of commits, followed by a dash, a
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]792 <em>g</em>, and an abbreviated object name.
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]793</p>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]794</dd>
795<dt class="hdlist1">
796<em>&lt;refname&gt;</em>, e.g. <em>master</em>, <em>heads/master</em>, <em>refs/heads/master</em>
797</dt>
798<dd>
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]799<p>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]800 A symbolic ref name. E.g. <em>master</em> typically means the commit
801 object referenced by <em>refs/heads/master</em>. If you
802 happen to have both <em>heads/master</em> and <em>tags/master</em>, you can
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]803 explicitly say <em>heads/master</em> to tell Git which one you mean.
Junio C Hamanof5933722012-07-25 23:25:21[diff] [blame]804 When ambiguous, a <em>&lt;refname&gt;</em> is disambiguated by taking the
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]805 first match in the following rules:
806</p>
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]807<div class="olist arabic"><ol class="arabic">
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]808<li>
809<p>
Junio C Hamanof5933722012-07-25 23:25:21[diff] [blame]810If <em>$GIT_DIR/&lt;refname&gt;</em> exists, that is what you mean (this is usually
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]811 useful only for <em>HEAD</em>, <em>FETCH_HEAD</em>, <em>ORIG_HEAD</em>, <em>MERGE_HEAD</em>
812 and <em>CHERRY_PICK_HEAD</em>);
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]813</p>
814</li>
815<li>
816<p>
Junio C Hamanof5933722012-07-25 23:25:21[diff] [blame]817otherwise, <em>refs/&lt;refname&gt;</em> if it exists;
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]818</p>
819</li>
820<li>
821<p>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]822otherwise, <em>refs/tags/&lt;refname&gt;</em> if it exists;
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]823</p>
824</li>
825<li>
826<p>
Junio C Hamanof5933722012-07-25 23:25:21[diff] [blame]827otherwise, <em>refs/heads/&lt;refname&gt;</em> if it exists;
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]828</p>
829</li>
830<li>
831<p>
Junio C Hamanof5933722012-07-25 23:25:21[diff] [blame]832otherwise, <em>refs/remotes/&lt;refname&gt;</em> if it exists;
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]833</p>
834</li>
835<li>
836<p>
Junio C Hamanof5933722012-07-25 23:25:21[diff] [blame]837otherwise, <em>refs/remotes/&lt;refname&gt;/HEAD</em> if it exists.
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]838</p>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]839<div class="paragraph"><p><em>HEAD</em> names the commit on which you based the changes in the working tree.
840<em>FETCH_HEAD</em> records the branch which you fetched from a remote repository
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]841with your last <code>git fetch</code> invocation.
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]842<em>ORIG_HEAD</em> is created by commands that move your <em>HEAD</em> in a drastic
843way, to record the position of the <em>HEAD</em> before their operation, so that
844you can easily change the tip of the branch back to the state before you ran
845them.
846<em>MERGE_HEAD</em> records the commit(s) which you are merging into your branch
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]847when you run <code>git merge</code>.
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]848<em>CHERRY_PICK_HEAD</em> records the commit which you are cherry-picking
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]849when you run <code>git cherry-pick</code>.</p></div>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]850<div class="paragraph"><p>Note that any of the <em>refs/*</em> cases above may come either from
Junio C Hamanoeccdd4a2012-09-10 23:28:17[diff] [blame]851the <em>$GIT_DIR/refs</em> directory or from the <em>$GIT_DIR/packed-refs</em> file.
852While the ref name encoding is unspecified, UTF-8 is prefered as
853some output processing may assume ref names in UTF-8.</p></div>
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]854</li>
855</ol></div>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]856</dd>
857<dt class="hdlist1">
858<em>&lt;refname&gt;@{&lt;date&gt;}</em>, e.g. <em>master@{yesterday}</em>, <em>HEAD@{5 minutes ago}</em>
859</dt>
860<dd>
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]861<p>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]862 A ref followed by the suffix <em>@</em> with a date specification
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]863 enclosed in a brace
864 pair (e.g. <em>{yesterday}</em>, <em>{1 month 2 weeks 3 days 1 hour 1
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]865 second ago}</em> or <em>{1979-02-26 18:30:00}</em>) specifies the value
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]866 of the ref at a prior point in time. This suffix may only be
867 used immediately following a ref name and the ref must have an
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]868 existing log (<em>$GIT_DIR/logs/&lt;ref&gt;</em>). Note that this looks up the state
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]869 of your <strong>local</strong> ref at a given time; e.g., what was in your local
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]870 <em>master</em> branch last week. If you want to look at commits made during
871 certain times, see <em>--since</em> and <em>--until</em>.
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]872</p>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]873</dd>
874<dt class="hdlist1">
875<em>&lt;refname&gt;@{&lt;n&gt;}</em>, e.g. <em>master@{1}</em>
876</dt>
877<dd>
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]878<p>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]879 A ref followed by the suffix <em>@</em> with an ordinal specification
880 enclosed in a brace pair (e.g. <em>{1}</em>, <em>{15}</em>) specifies
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]881 the n-th prior value of that ref. For example <em>master@{1}</em>
882 is the immediate prior value of <em>master</em> while <em>master@{5}</em>
883 is the 5th prior value of <em>master</em>. This suffix may only be used
884 immediately following a ref name and the ref must have an existing
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]885 log (<em>$GIT_DIR/logs/&lt;refname&gt;</em>).
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]886</p>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]887</dd>
888<dt class="hdlist1">
889<em>@{&lt;n&gt;}</em>, e.g. <em>@{1}</em>
890</dt>
891<dd>
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]892<p>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]893 You can use the <em>@</em> construct with an empty ref part to get at a
894 reflog entry of the current branch. For example, if you are on
895 branch <em>blabla</em> then <em>@{1}</em> means the same as <em>blabla@{1}</em>.
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]896</p>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]897</dd>
898<dt class="hdlist1">
899<em>@{-&lt;n&gt;}</em>, e.g. <em>@{-1}</em>
900</dt>
901<dd>
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]902<p>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]903 The construct <em>@{-&lt;n&gt;}</em> means the &lt;n&gt;th branch checked out
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]904 before the current one.
905</p>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]906</dd>
907<dt class="hdlist1">
908<em>&lt;refname&gt;@{upstream}</em>, e.g. <em>master@{upstream}</em>, <em>@{u}</em>
909</dt>
910<dd>
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]911<p>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]912 The suffix <em>@{upstream}</em> to a ref (short form <em>&lt;refname&gt;@{u}</em>) refers to
913 the branch the ref is set to build on top of. A missing ref defaults
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]914 to the current branch.
915</p>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]916</dd>
917<dt class="hdlist1">
918<em>&lt;rev&gt;&#94;</em>, e.g. <em>HEAD&#94;, v1.5.1&#94;0</em>
919</dt>
920<dd>
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]921<p>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]922 A suffix <em>&#94;</em> to a revision parameter means the first parent of
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]923 that commit object. <em>&#94;&lt;n&gt;</em> means the &lt;n&gt;th parent (i.e.
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]924 <em>&lt;rev&gt;&#94;</em>
925 is equivalent to <em>&lt;rev&gt;&#94;1</em>). As a special rule,
926 <em>&lt;rev&gt;&#94;0</em> means the commit itself and is used when <em>&lt;rev&gt;</em> is the
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]927 object name of a tag object that refers to a commit object.
928</p>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]929</dd>
930<dt class="hdlist1">
931<em>&lt;rev&gt;&#126;&lt;n&gt;</em>, e.g. <em>master&#126;3</em>
932</dt>
933<dd>
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]934<p>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]935 A suffix <em>&#126;&lt;n&gt;</em> to a revision parameter means the commit
Junio C Hamano81d540a2012-03-02 19:52:47[diff] [blame]936 object that is the &lt;n&gt;th generation ancestor of the named
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]937 commit object, following only the first parents. I.e. <em>&lt;rev&gt;&#126;3</em> is
938 equivalent to <em>&lt;rev&gt;&#94;&#94;&#94;</em> which is equivalent to
939 <em>&lt;rev&gt;&#94;1&#94;1&#94;1</em>. See below for an illustration of
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]940 the usage of this form.
941</p>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]942</dd>
943<dt class="hdlist1">
944<em>&lt;rev&gt;&#94;{&lt;type&gt;}</em>, e.g. <em>v0.99.8&#94;{commit}</em>
945</dt>
946<dd>
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]947<p>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]948 A suffix <em>&#94;</em> followed by an object type name enclosed in
949 brace pair means the object
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]950 could be a tag, and dereference the tag recursively until an
951 object of that type is found or the object cannot be
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]952 dereferenced anymore (in which case, barf). <em>&lt;rev&gt;&#94;0</em>
953 is a short-hand for <em>&lt;rev&gt;&#94;{commit}</em>.
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]954</p>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]955</dd>
956<dt class="hdlist1">
957<em>&lt;rev&gt;&#94;{}</em>, e.g. <em>v0.99.8&#94;{}</em>
958</dt>
959<dd>
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]960<p>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]961 A suffix <em>&#94;</em> followed by an empty brace pair
962 means the object could be a tag,
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]963 and dereference the tag recursively until a non-tag object is
964 found.
965</p>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]966</dd>
967<dt class="hdlist1">
968<em>&lt;rev&gt;&#94;{/&lt;text&gt;}</em>, e.g. <em>HEAD^{/fix nasty bug}</em>
969</dt>
970<dd>
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]971<p>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]972 A suffix <em>&#94;</em> to a revision parameter, followed by a brace
973 pair that contains a text led by a slash,
974 is the same as the <em>:/fix nasty bug</em> syntax below except that
Junio C Hamano18b5ad52010-12-22 01:57:50[diff] [blame]975 it returns the youngest matching commit which is reachable from
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]976 the <em>&lt;rev&gt;</em> before <em>&#94;</em>.
Junio C Hamano18b5ad52010-12-22 01:57:50[diff] [blame]977</p>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]978</dd>
979<dt class="hdlist1">
980<em>:/&lt;text&gt;</em>, e.g. <em>:/fix nasty bug</em>
981</dt>
982<dd>
Junio C Hamano18b5ad52010-12-22 01:57:50[diff] [blame]983<p>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]984 A colon, followed by a slash, followed by a text, names
Junio C Hamano442206c2010-09-28 05:51:23[diff] [blame]985 a commit whose commit message matches the specified regular expression.
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]986 This name returns the youngest matching commit which is
987 reachable from any ref. If the commit message starts with a
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]988 <em>!</em> you have to repeat that; the special sequence <em>:/!</em>,
989 followed by something else than <em>!</em>, is reserved for now.
Junio C Hamano442206c2010-09-28 05:51:23[diff] [blame]990 The regular expression can match any part of the commit message. To
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]991 match messages starting with a string, one can use e.g. <em>:/^foo</em>.
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]992</p>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]993</dd>
994<dt class="hdlist1">
995<em>&lt;rev&gt;:&lt;path&gt;</em>, e.g. <em>HEAD:README</em>, <em>:README</em>, <em>master:./README</em>
996</dt>
997<dd>
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]998<p>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]999 A suffix <em>:</em> followed by a path names the blob or tree
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]1000 at the given path in the tree-ish object named by the part
1001 before the colon.
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]1002 <em>:path</em> (with an empty part before the colon)
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]1003 is a special case of the syntax described next: content
1004 recorded in the index at the given path.
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]1005 A path starting with <em>./</em> or <em>../</em> is relative to the current working directory.
1006 The given path will be converted to be relative to the working tree&#8217;s root directory.
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]1007 This is most useful to address a blob or tree from a commit or tree that has
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]1008 the same tree structure as the working tree.
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]1009</p>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]1010</dd>
1011<dt class="hdlist1">
1012<em>:&lt;n&gt;:&lt;path&gt;</em>, e.g. <em>:0:README</em>, <em>:README</em>
1013</dt>
1014<dd>
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]1015<p>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]1016 A colon, optionally followed by a stage number (0 to 3) and a
1017 colon, followed by a path, names a blob object in the
1018 index at the given path. A missing stage number (and the colon
1019 that follows it) names a stage 0 entry. During a merge, stage
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]1020 1 is the common ancestor, stage 2 is the target branch&#8217;s version
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]1021 (typically the current branch), and stage 3 is the version from
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]1022 the branch which is being merged.
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]1023</p>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]1024</dd>
1025</dl></div>
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]1026<div class="paragraph"><p>Here is an illustration, by Jon Loeliger. Both commit nodes B
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]1027and C are parents of commit node A. Parent commits are ordered
1028left-to-right.</p></div>
1029<div class="literalblock">
1030<div class="content">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1031<pre><code>G H I J
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]1032 \ / \ /
1033 D E F
1034 \ | / \
1035 \ | / |
1036 \|/ |
1037 B C
1038 \ /
1039 \ /
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1040 A</code></pre>
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]1041</div></div>
1042<div class="literalblock">
1043<div class="content">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1044<pre><code>A = = A^0
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]1045B = A^ = A^1 = A~1
1046C = A^2 = A^2
1047D = A^^ = A^1^1 = A~2
1048E = B^2 = A^^2
1049F = B^3 = A^^3
1050G = A^^^ = A^1^1^1 = A~3
1051H = D^2 = B^^2 = A^^^2 = A~2^2
1052I = F^ = B^3^ = A^^3^
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1053J = F^2 = B^3^2 = A^^3^2</code></pre>
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]1054</div></div>
1055</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1056</div>
1057<div class="sect1">
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]1058<h2 id="_specifying_ranges">SPECIFYING RANGES</h2>
1059<div class="sectionbody">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1060<div class="paragraph"><p>History traversing commands such as <code>git log</code> operate on a set
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]1061of commits, not just a single commit. To these commands,
1062specifying a single revision with the notation described in the
1063previous section means the set of commits reachable from that
1064commit, following the commit ancestry chain.</p></div>
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]1065<div class="paragraph"><p>To exclude commits reachable from a commit, a prefix <em>&#94;</em>
1066notation is used. E.g. <em>&#94;r1 r2</em> means commits reachable
1067from <em>r2</em> but exclude the ones reachable from <em>r1</em>.</p></div>
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]1068<div class="paragraph"><p>This set operation appears so often that there is a shorthand
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]1069for it. When you have two commits <em>r1</em> and <em>r2</em> (named according
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]1070to the syntax explained in SPECIFYING REVISIONS above), you can ask
1071for commits that are reachable from r2 excluding those that are reachable
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]1072from r1 by <em>&#94;r1 r2</em> and it can be written as <em>r1..r2</em>.</p></div>
1073<div class="paragraph"><p>A similar notation <em>r1...r2</em> is called symmetric difference
1074of <em>r1</em> and <em>r2</em> and is defined as
1075<em>r1 r2 --not $(git merge-base --all r1 r2)</em>.
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]1076It is the set of commits that are reachable from either one of
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]1077<em>r1</em> or <em>r2</em> but not from both.</p></div>
Junio C Hamanoeccdd4a2012-09-10 23:28:17[diff] [blame]1078<div class="paragraph"><p>In these two shorthands, you can omit one end and let it default to HEAD.
1079For example, <em>origin..</em> is a shorthand for <em>origin..HEAD</em> and asks "What
1080did I do since I forked from the origin branch?" Similarly, <em>..origin</em>
1081is a shorthand for <em>HEAD..origin</em> and asks "What did the origin do since
1082I forked from them?" Note that <em>..</em> would mean <em>HEAD..HEAD</em> which is an
1083empty range that is both reachable and unreachable from HEAD.</p></div>
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]1084<div class="paragraph"><p>Two other shorthands for naming a set that is formed by a commit
Junio C Hamanoee3adc32011-04-06 19:53:38[diff] [blame]1085and its parent commits exist. The <em>r1&#94;@</em> notation means all
1086parents of <em>r1</em>. <em>r1&#94;!</em> includes commit <em>r1</em> but excludes
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]1087all of its parents.</p></div>
Junio C Hamanof5933722012-07-25 23:25:21[diff] [blame]1088<div class="paragraph"><p>To summarize:</p></div>
1089<div class="dlist"><dl>
1090<dt class="hdlist1">
1091<em>&lt;rev&gt;</em>
1092</dt>
1093<dd>
1094<p>
1095 Include commits that are reachable from (i.e. ancestors of)
1096 &lt;rev&gt;.
1097</p>
1098</dd>
1099<dt class="hdlist1">
1100<em>&#94;&lt;rev&gt;</em>
1101</dt>
1102<dd>
1103<p>
1104 Exclude commits that are reachable from (i.e. ancestors of)
1105 &lt;rev&gt;.
1106</p>
1107</dd>
1108<dt class="hdlist1">
1109<em>&lt;rev1&gt;..&lt;rev2&gt;</em>
1110</dt>
1111<dd>
1112<p>
1113 Include commits that are reachable from &lt;rev2&gt; but exclude
1114 those that are reachable from &lt;rev1&gt;.
1115</p>
1116</dd>
1117<dt class="hdlist1">
1118<em>&lt;rev1&gt;...&lt;rev2&gt;</em>
1119</dt>
1120<dd>
1121<p>
1122 Include commits that are reachable from either &lt;rev1&gt; or
1123 &lt;rev2&gt; but exclude those that are reachable from both.
1124</p>
1125</dd>
1126<dt class="hdlist1">
1127<em>&lt;rev&gt;&#94;@</em>, e.g. <em>HEAD&#94;@</em>
1128</dt>
1129<dd>
1130<p>
1131 A suffix <em>&#94;</em> followed by an at sign is the same as listing
1132 all parents of <em>&lt;rev&gt;</em> (meaning, include anything reachable from
1133 its parents, but not the commit itself).
1134</p>
1135</dd>
1136<dt class="hdlist1">
1137<em>&lt;rev&gt;&#94;!</em>, e.g. <em>HEAD&#94;!</em>
1138</dt>
1139<dd>
1140<p>
1141 A suffix <em>&#94;</em> followed by an exclamation mark is the same
1142 as giving commit <em>&lt;rev&gt;</em> and then all its parents prefixed with
1143 <em>&#94;</em> to exclude them (and their ancestors).
1144</p>
1145</dd>
1146</dl></div>
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]1147<div class="paragraph"><p>Here are a handful of examples:</p></div>
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]1148<div class="literalblock">
1149<div class="content">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1150<pre><code>D G H D
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]1151D F G H I J D F
1152^G D H D
1153^D B E I J F B
Junio C Hamanof5933722012-07-25 23:25:21[diff] [blame]1154B..C C
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]1155B...C G H D E B C
1156^D B C E I J F B C
Junio C Hamanof5933722012-07-25 23:25:21[diff] [blame]1157C I J F C
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]1158C^@ I J F
Junio C Hamanof5933722012-07-25 23:25:21[diff] [blame]1159C^! C
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1160F^! D G H D F</code></pre>
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]1161</div></div>
1162</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1163</div>
1164<div class="sect1">
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]1165<h2 id="_see_also">SEE ALSO</h2>
1166<div class="sectionbody">
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1167<div class="paragraph"><p><a href="git-rev-parse.html">git-rev-parse(1)</a></p></div>
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]1168</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1169</div>
1170<div class="sect1">
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]1171<h2 id="_git">GIT</h2>
1172<div class="sectionbody">
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1173<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]1174</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]1175</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1176</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]1177<div id="footnotes"><hr /></div>
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]1178<div id="footer">
1179<div id="footer-text">
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]1180Last updated 2013-02-05 21:07:26 PST
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]1181</div>
1182</div>
1183</body>
1184</html>