blob: f204c4f84d6c5673582289e509b6a47dcd2491df [file] [log] [blame]
Junio C Hamano1a4e8412005-12-27 08:17:231<!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" />
Junio C Hamano7bd050f2011-09-22 06:32:226<meta name="generator" content="AsciiDoc 8.5.2" />
Junio C Hamano68cf15a2010-11-06 01:01:597<title>gitk(1)</title>
Junio C Hamano1a4e8412005-12-27 08:17:238<style type="text/css">
9/* Debug borders */
10p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
11/*
12 border: 1px solid red;
13*/
14}
15
16body {
17 margin: 1em 5% 1em 5%;
18}
19
Junio C Hamanoba4b9282008-07-06 05:20:3120a {
21 color: blue;
22 text-decoration: underline;
23}
24a:visited {
25 color: fuchsia;
26}
Junio C Hamano1a4e8412005-12-27 08:17:2327
28em {
29 font-style: italic;
Junio C Hamano68cf15a2010-11-06 01:01:5930 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:2331}
32
33strong {
34 font-weight: bold;
Junio C Hamano68cf15a2010-11-06 01:01:5935 color: #083194;
Junio C Hamano1a4e8412005-12-27 08:17:2336}
37
38tt {
39 color: navy;
40}
41
42h1, 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;
48}
49
Junio C Hamanoba4b9282008-07-06 05:20:3150h1, h2, h3 {
Junio C Hamano1a4e8412005-12-27 08:17:2351 border-bottom: 2px solid silver;
52}
53h2 {
Junio C Hamano1a4e8412005-12-27 08:17:2354 padding-top: 0.5em;
55}
Junio C Hamanoba4b9282008-07-06 05:20:3156h3 {
57 float: left;
58}
59h3 + * {
60 clear: left;
61}
Junio C Hamano1a4e8412005-12-27 08:17:2362
63div.sectionbody {
64 font-family: serif;
65 margin-left: 0;
66}
67
68hr {
69 border: 1px solid silver;
70}
71
72p {
73 margin-top: 0.5em;
74 margin-bottom: 0.5em;
75}
76
Junio C Hamano68cf15a2010-11-06 01:01:5977ul, ol, li > p {
78 margin-top: 0;
79}
80
Junio C Hamano1a4e8412005-12-27 08:17:2381pre {
82 padding: 0;
83 margin: 0;
84}
85
86span#author {
87 color: #527bbd;
88 font-family: sans-serif;
89 font-weight: bold;
Junio C Hamanoba4b9282008-07-06 05:20:3190 font-size: 1.1em;
Junio C Hamano1a4e8412005-12-27 08:17:2391}
92span#email {
93}
Junio C Hamano68cf15a2010-11-06 01:01:5994span#revnumber, span#revdate, span#revremark {
Junio C Hamano1a4e8412005-12-27 08:17:2395 font-family: sans-serif;
96}
97
98div#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;
104}
105div#footer-text {
106 float: left;
107 padding-bottom: 0.5em;
108}
109div#footer-badges {
110 float: right;
111 padding-bottom: 0.5em;
112}
113
Junio C Hamano68cf15a2010-11-06 01:01:59114div#preamble {
115 margin-top: 1.5em;
116 margin-bottom: 1.5em;
117}
Junio C Hamano1a4e8412005-12-27 08:17:23118div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
119div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
120div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22121 margin-top: 1.0em;
Junio C Hamano1a4e8412005-12-27 08:17:23122 margin-bottom: 1.5em;
123}
124div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22125 margin-top: 2.0em;
126 margin-bottom: 2.0em;
127 margin-right: 10%;
128 color: #606060;
Junio C Hamano1a4e8412005-12-27 08:17:23129}
130
131div.content { /* Block element content. */
132 padding: 0;
133}
134
135/* Block element titles. */
136div.title, caption.title {
Junio C Hamano68cf15a2010-11-06 01:01:59137 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23138 font-family: sans-serif;
139 font-weight: bold;
140 text-align: left;
141 margin-top: 1.0em;
142 margin-bottom: 0.5em;
143}
144div.title + * {
145 margin-top: 0;
146}
147
148td div.title:first-child {
149 margin-top: 0.0em;
150}
151div.content div.title:first-child {
152 margin-top: 0.0em;
153}
154div.content + div.title {
155 margin-top: 0.0em;
156}
157
158div.sidebarblock > div.content {
159 background: #ffffee;
160 border: 1px solid silver;
161 padding: 0.5em;
162}
163
164div.listingblock > div.content {
165 border: 1px solid silver;
166 background: #f4f4f4;
167 padding: 0.5em;
168}
169
Junio C Hamano7bd050f2011-09-22 06:32:22170div.quoteblock, div.verseblock {
171 padding-left: 1.0em;
172 margin-left: 1.0em;
Junio C Hamano68cf15a2010-11-06 01:01:59173 margin-right: 10%;
Junio C Hamano7bd050f2011-09-22 06:32:22174 border-left: 5px solid #dddddd;
175 color: #777777;
Junio C Hamano1a4e8412005-12-27 08:17:23176}
Junio C Hamano7bd050f2011-09-22 06:32:22177
Junio C Hamano68cf15a2010-11-06 01:01:59178div.quoteblock > div.attribution {
179 padding-top: 0.5em;
Junio C Hamano1a4e8412005-12-27 08:17:23180 text-align: right;
181}
Junio C Hamano68cf15a2010-11-06 01:01:59182
Junio C Hamano68cf15a2010-11-06 01:01:59183div.verseblock > div.content {
184 white-space: pre;
185}
186div.verseblock > div.attribution {
187 padding-top: 0.75em;
188 text-align: left;
189}
190/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
Junio C Hamanoba4b9282008-07-06 05:20:31191div.verseblock + div.attribution {
192 text-align: left;
193}
Junio C Hamano1a4e8412005-12-27 08:17:23194
195div.admonitionblock .icon {
196 vertical-align: top;
197 font-size: 1.1em;
198 font-weight: bold;
199 text-decoration: underline;
200 color: #527bbd;
201 padding-right: 0.5em;
202}
203div.admonitionblock td.content {
204 padding-left: 0.5em;
Junio C Hamano7bd050f2011-09-22 06:32:22205 border-left: 3px solid #dddddd;
Junio C Hamano1a4e8412005-12-27 08:17:23206}
207
208div.exampleblock > div.content {
Junio C Hamano7bd050f2011-09-22 06:32:22209 border-left: 3px solid #dddddd;
210 padding-left: 0.5em;
Junio C Hamano1a4e8412005-12-27 08:17:23211}
212
Junio C Hamano1a4e8412005-12-27 08:17:23213div.imageblock div.content { padding-left: 0; }
Junio C Hamano1a4e8412005-12-27 08:17:23214span.image img { border-style: none; }
Junio C Hamano68cf15a2010-11-06 01:01:59215a.image:visited { color: white; }
Junio C Hamano1a4e8412005-12-27 08:17:23216
217dl {
218 margin-top: 0.8em;
219 margin-bottom: 0.8em;
220}
221dt {
222 margin-top: 0.5em;
223 margin-bottom: 0;
Junio C Hamano68cf15a2010-11-06 01:01:59224 font-style: normal;
225 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23226}
227dd > *:first-child {
Junio C Hamano68cf15a2010-11-06 01:01:59228 margin-top: 0.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23229}
230
231ul, ol {
232 list-style-position: outside;
233}
Junio C Hamano68cf15a2010-11-06 01:01:59234ol.arabic {
235 list-style-type: decimal;
236}
237ol.loweralpha {
Junio C Hamano1a4e8412005-12-27 08:17:23238 list-style-type: lower-alpha;
239}
Junio C Hamano68cf15a2010-11-06 01:01:59240ol.upperalpha {
241 list-style-type: upper-alpha;
242}
243ol.lowerroman {
244 list-style-type: lower-roman;
245}
246ol.upperroman {
247 list-style-type: upper-roman;
248}
249
250div.compact ul, div.compact ol,
251div.compact p, div.compact p,
252div.compact div, div.compact div {
253 margin-top: 0.1em;
254 margin-bottom: 0.1em;
255}
Junio C Hamano1a4e8412005-12-27 08:17:23256
257div.tableblock > table {
Junio C Hamanoba4b9282008-07-06 05:20:31258 border: 3px solid #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23259}
Junio C Hamano7bd050f2011-09-22 06:32:22260thead, p.table.header {
Junio C Hamano1a4e8412005-12-27 08:17:23261 font-family: sans-serif;
262 font-weight: bold;
263}
264tfoot {
265 font-weight: bold;
266}
Junio C Hamano68cf15a2010-11-06 01:01:59267td > div.verse {
268 white-space: pre;
269}
270p.table {
271 margin-top: 0;
272}
273/* Because the table frame attribute is overriden by CSS in most browsers. */
274div.tableblock > table[frame="void"] {
275 border-style: none;
276}
277div.tableblock > table[frame="hsides"] {
278 border-left-style: none;
279 border-right-style: none;
280}
281div.tableblock > table[frame="vsides"] {
282 border-top-style: none;
283 border-bottom-style: none;
284}
Junio C Hamano1a4e8412005-12-27 08:17:23285
Junio C Hamano68cf15a2010-11-06 01:01:59286
287div.hdlist {
Junio C Hamano1a4e8412005-12-27 08:17:23288 margin-top: 0.8em;
289 margin-bottom: 0.8em;
290}
Junio C Hamano68cf15a2010-11-06 01:01:59291div.hdlist tr {
292 padding-bottom: 15px;
Junio C Hamanoba4b9282008-07-06 05:20:31293}
Junio C Hamano68cf15a2010-11-06 01:01:59294dt.hdlist1.strong, td.hdlist1.strong {
295 font-weight: bold;
296}
297td.hdlist1 {
Junio C Hamano1a4e8412005-12-27 08:17:23298 vertical-align: top;
Junio C Hamano68cf15a2010-11-06 01:01:59299 font-style: normal;
Junio C Hamano1a4e8412005-12-27 08:17:23300 padding-right: 0.8em;
Junio C Hamano68cf15a2010-11-06 01:01:59301 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23302}
Junio C Hamano68cf15a2010-11-06 01:01:59303td.hdlist2 {
Junio C Hamano1a4e8412005-12-27 08:17:23304 vertical-align: top;
305}
Junio C Hamano68cf15a2010-11-06 01:01:59306div.hdlist.compact tr {
307 margin: 0;
308 padding-bottom: 0;
309}
310
311.comment {
312 background: yellow;
313}
Junio C Hamano1a4e8412005-12-27 08:17:23314
Junio C Hamano7bd050f2011-09-22 06:32:22315.footnote, .footnoteref {
316 font-size: 0.8em;
317}
318
319span.footnote, span.footnoteref {
320 vertical-align: super;
321}
322
323#footnotes {
324 margin: 20px 0 20px 0;
325 padding: 7px 0 0 0;
326}
327
328#footnotes div.footnote {
329 margin: 0 0 5px 0;
330}
331
332#footnotes hr {
333 border: none;
334 border-top: 1px solid silver;
335 height: 1px;
336 text-align: left;
337 margin-left: 0;
338 width: 20%;
339 min-width: 100px;
340}
341
342
Junio C Hamano1a4e8412005-12-27 08:17:23343@media print {
344 div#footer-badges { display: none; }
345}
Junio C Hamanoba4b9282008-07-06 05:20:31346
Junio C Hamano7bd050f2011-09-22 06:32:22347div#toc {
348 margin-bottom: 2.5em;
349}
350
Junio C Hamanoba4b9282008-07-06 05:20:31351div#toctitle {
352 color: #527bbd;
353 font-family: sans-serif;
354 font-size: 1.1em;
355 font-weight: bold;
356 margin-top: 1.0em;
357 margin-bottom: 0.1em;
358}
359
360div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
361 margin-top: 0;
362 margin-bottom: 0;
363}
364div.toclevel2 {
365 margin-left: 2em;
366 font-size: 0.9em;
367}
368div.toclevel3 {
369 margin-left: 4em;
370 font-size: 0.9em;
371}
372div.toclevel4 {
373 margin-left: 6em;
374 font-size: 0.9em;
375}
Junio C Hamano68cf15a2010-11-06 01:01:59376/* Overrides for manpage documents */
377h1 {
378 padding-top: 0.5em;
379 padding-bottom: 0.5em;
380 border-top: 2px solid silver;
381 border-bottom: 2px solid silver;
382}
383h2 {
384 border-style: none;
385}
386div.sectionbody {
387 margin-left: 5%;
388}
389
390@media print {
391 div#toc { display: none; }
392}
393
Junio C Hamano1a4e8412005-12-27 08:17:23394/* Workarounds for IE6's broken and incomplete CSS2. */
395
396div.sidebar-content {
397 background: #ffffee;
398 border: 1px solid silver;
399 padding: 0.5em;
400}
401div.sidebar-title, div.image-title {
Junio C Hamano68cf15a2010-11-06 01:01:59402 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23403 font-family: sans-serif;
404 font-weight: bold;
405 margin-top: 0.0em;
406 margin-bottom: 0.5em;
407}
408
409div.listingblock div.content {
410 border: 1px solid silver;
411 background: #f4f4f4;
412 padding: 0.5em;
413}
414
Junio C Hamano68cf15a2010-11-06 01:01:59415div.quoteblock-attribution {
416 padding-top: 0.5em;
417 text-align: right;
418}
419
420div.verseblock-content {
421 white-space: pre;
422}
423div.verseblock-attribution {
424 padding-top: 0.75em;
425 text-align: left;
Junio C Hamano1a4e8412005-12-27 08:17:23426}
427
428div.exampleblock-content {
Junio C Hamano7bd050f2011-09-22 06:32:22429 border-left: 3px solid #dddddd;
Junio C Hamano1a4e8412005-12-27 08:17:23430 padding-left: 0.5em;
431}
Junio C Hamanoba4b9282008-07-06 05:20:31432
433/* IE6 sets dynamically generated links as visited. */
434div#toc a:visited { color: blue; }
Junio C Hamano1a4e8412005-12-27 08:17:23435</style>
Junio C Hamano7bd050f2011-09-22 06:32:22436<script type="text/javascript">
437/*<![CDATA[*/
438window.onload = function(){asciidoc.footnotes();}
439var asciidoc = { // Namespace.
440
441/////////////////////////////////////////////////////////////////////
442// Table Of Contents generator
443/////////////////////////////////////////////////////////////////////
444
445/* Author: Mihai Bazon, September 2002
446 * http://students.infoiasi.ro/~mishoo
447 *
448 * Table Of Content generator
449 * Version: 0.4
450 *
451 * Feel free to use this script under the terms of the GNU General Public
452 * License, as long as you do not remove or alter this notice.
453 */
454
455 /* modified by Troy D. Hanson, September 2006. License: GPL */
456 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
457
458// toclevels = 1..4.
459toc: function (toclevels) {
460
461 function getText(el) {
462 var text = "";
463 for (var i = el.firstChild; i != null; i = i.nextSibling) {
464 if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
465 text += i.data;
466 else if (i.firstChild != null)
467 text += getText(i);
468 }
469 return text;
470 }
471
472 function TocEntry(el, text, toclevel) {
473 this.element = el;
474 this.text = text;
475 this.toclevel = toclevel;
476 }
477
478 function tocEntries(el, toclevels) {
479 var result = new Array;
480 var re = new RegExp('[hH]([2-'+(toclevels+1)+'])');
481 // Function that scans the DOM tree for header elements (the DOM2
482 // nodeIterator API would be a better technique but not supported by all
483 // browsers).
484 var iterate = function (el) {
485 for (var i = el.firstChild; i != null; i = i.nextSibling) {
486 if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
487 var mo = re.exec(i.tagName);
488 if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
489 result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
490 }
491 iterate(i);
492 }
493 }
494 }
495 iterate(el);
496 return result;
497 }
498
499 var toc = document.getElementById("toc");
500 var entries = tocEntries(document.getElementById("content"), toclevels);
501 for (var i = 0; i < entries.length; ++i) {
502 var entry = entries[i];
503 if (entry.element.id == "")
504 entry.element.id = "_toc_" + i;
505 var a = document.createElement("a");
506 a.href = "#" + entry.element.id;
507 a.appendChild(document.createTextNode(entry.text));
508 var div = document.createElement("div");
509 div.appendChild(a);
510 div.className = "toclevel" + entry.toclevel;
511 toc.appendChild(div);
512 }
513 if (entries.length == 0)
514 toc.parentNode.removeChild(toc);
515},
516
517
518/////////////////////////////////////////////////////////////////////
519// Footnotes generator
520/////////////////////////////////////////////////////////////////////
521
522/* Based on footnote generation code from:
523 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
524 */
525
526footnotes: function () {
527 var cont = document.getElementById("content");
528 var noteholder = document.getElementById("footnotes");
529 var spans = cont.getElementsByTagName("span");
530 var refs = {};
531 var n = 0;
532 for (i=0; i<spans.length; i++) {
533 if (spans[i].className == "footnote") {
534 n++;
535 // Use [\s\S] in place of . so multi-line matches work.
536 // Because JavaScript has no s (dotall) regex flag.
537 note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
538 noteholder.innerHTML +=
539 "<div class='footnote' id='_footnote_" + n + "'>" +
540 "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
541 n + "</a>. " + note + "</div>";
542 spans[i].innerHTML =
543 "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
544 "' title='View footnote' class='footnote'>" + n + "</a>]";
545 var id =spans[i].getAttribute("id");
546 if (id != null) refs["#"+id] = n;
547 }
548 }
549 if (n == 0)
550 noteholder.parentNode.removeChild(noteholder);
551 else {
552 // Process footnoterefs.
553 for (i=0; i<spans.length; i++) {
554 if (spans[i].className == "footnoteref") {
555 var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
556 href = href.match(/#.*/)[0]; // Because IE return full URL.
557 n = refs[href];
558 spans[i].innerHTML =
559 "[<a href='#_footnote_" + n +
560 "' title='View footnote' class='footnote'>" + n + "</a>]";
561 }
562 }
563 }
564}
565
566}
567/*]]>*/
568</script>
Junio C Hamano1a4e8412005-12-27 08:17:23569</head>
570<body>
571<div id="header">
572<h1>
573gitk(1) Manual Page
574</h1>
575<h2>NAME</h2>
576<div class="sectionbody">
577<p>gitk -
Junio C Hamano7c73c662007-01-19 00:37:50578 The git repository browser
Junio C Hamano1a4e8412005-12-27 08:17:23579</p>
580</div>
581</div>
Junio C Hamano7bd050f2011-09-22 06:32:22582<div id="content">
Junio C Hamano68cf15a2010-11-06 01:01:59583<h2 id="_synopsis">SYNOPSIS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23584<div class="sectionbody">
Junio C Hamano15567bc2011-07-23 00:51:59585<div class="verseblock">
586<div class="verseblock-content"><em>gitk</em> [&lt;option&gt;&#8230;] [&lt;revs&gt;] [--] [&lt;path&gt;&#8230;]</div>
587<div class="verseblock-attribution">
588</div></div>
Junio C Hamano1a4e8412005-12-27 08:17:23589</div>
Junio C Hamanoba4b9282008-07-06 05:20:31590<h2 id="_description">DESCRIPTION</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23591<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59592<div class="paragraph"><p>Displays changes in a repository or a selected set of commits. This includes
Junio C Hamano6b2cee12006-08-26 08:43:31593visualizing the commit graph, showing information related to each commit, and
Junio C Hamanoba4b9282008-07-06 05:20:31594the files in the trees of each revision.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59595<div class="paragraph"><p>Historically, gitk was the first repository browser. It&#8217;s written in tcl/tk
Junio C Hamano6b2cee12006-08-26 08:43:31596and started off in a separate repository but was later merged into the main
Junio C Hamanoba4b9282008-07-06 05:20:31597git repository.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23598</div>
Junio C Hamanoba4b9282008-07-06 05:20:31599<h2 id="_options">OPTIONS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23600<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59601<div class="paragraph"><p>To control which revisions to show, the command takes options applicable to
Junio C Hamanoa28a9202012-06-21 07:08:23602the <em>git rev-list</em> command (see <a href="git-rev-list.html">git-rev-list(1)</a>).
Junio C Hamanofce7c7e2008-07-02 03:06:38603This manual page describes only the most
Junio C Hamanoba4b9282008-07-06 05:20:31604frequently used options.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59605<div class="dlist"><dl>
606<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47607-n &lt;number&gt;
608</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59609<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47610--max-count=&lt;number&gt;
Junio C Hamano1a4e8412005-12-27 08:17:23611</dt>
612<dd>
613<p>
Junio C Hamano6b2cee12006-08-26 08:43:31614 Limits the number of commits to show.
Junio C Hamano1a4e8412005-12-27 08:17:23615</p>
616</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59617<dt class="hdlist1">
Junio C Hamano6b2cee12006-08-26 08:43:31618--since=&lt;date&gt;
Junio C Hamano1a4e8412005-12-27 08:17:23619</dt>
620<dd>
621<p>
Junio C Hamano6b2cee12006-08-26 08:43:31622 Show commits more recent than a specific date.
623</p>
624</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59625<dt class="hdlist1">
Junio C Hamano6b2cee12006-08-26 08:43:31626--until=&lt;date&gt;
627</dt>
628<dd>
629<p>
630 Show commits older than a specific date.
631</p>
632</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59633<dt class="hdlist1">
Junio C Hamanod5784132006-09-20 21:29:27634--all
635</dt>
636<dd>
637<p>
638 Show all branches.
639</p>
640</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59641<dt class="hdlist1">
Junio C Hamano7d575a52008-04-30 08:45:27642--merge
643</dt>
644<dd>
645<p>
646 After an attempt to merge stops with conflicts, show the commits on
647 the history between two branches (i.e. the HEAD and the MERGE_HEAD)
Junio C Hamano61169122009-02-09 18:05:49648 that modify the conflicted files and do not exist on all the heads
649 being merged.
Junio C Hamano7d575a52008-04-30 08:45:27650</p>
651</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59652<dt class="hdlist1">
Junio C Hamanoa387df32008-08-29 08:56:58653--argscmd=&lt;command&gt;
654</dt>
655<dd>
656<p>
657 Command to be run each time gitk has to determine the list of
658 &lt;revs&gt; to show. The command is expected to print on its standard
659 output a list of additional revs to be shown, one per line.
660 Use this instead of explicitly specifying &lt;revs&gt; if the set of
661 commits to show may vary between refreshes.
662</p>
663</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59664<dt class="hdlist1">
Junio C Hamanod3452a02008-11-15 08:07:55665--select-commit=&lt;ref&gt;
666</dt>
667<dd>
668<p>
669 Automatically select the specified commit after loading the graph.
670 Default behavior is equivalent to specifying <em>--select-commit=HEAD</em>.
671</p>
672</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59673<dt class="hdlist1">
Junio C Hamano6b2cee12006-08-26 08:43:31674&lt;revs&gt;
675</dt>
676<dd>
677<p>
678 Limit the revisions to show. This can be either a single revision
679 meaning show from the given revision and back, or it can be a range in
680 the form "<em>&lt;from&gt;</em>..<em>&lt;to&gt;</em>" to show all revisions between <em>&lt;from&gt;</em> and
681 back to <em>&lt;to&gt;</em>. Note, more advanced revision selection can be applied.
Junio C Hamano2d47c622007-01-18 06:24:10682 For a more complete list of ways to spell object names, see
Junio C Hamanoa28a9202012-06-21 07:08:23683 <a href="gitrevisions.html">gitrevisions(7)</a>.
Junio C Hamano6b2cee12006-08-26 08:43:31684</p>
685</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59686<dt class="hdlist1">
Junio C Hamano9e395072008-07-31 22:11:21687&lt;path&gt;&#8230;
Junio C Hamano6b2cee12006-08-26 08:43:31688</dt>
689<dd>
690<p>
691 Limit commits to the ones touching files in the given paths. Note, to
Junio C Hamanoa9eca4e2009-03-04 08:29:59692 avoid ambiguity with respect to revision names use "--" to separate the paths
Junio C Hamanoee1e4282007-02-04 08:32:04693 from any preceding options.
Junio C Hamano1a4e8412005-12-27 08:17:23694</p>
695</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31696</dl></div>
Junio C Hamano1a4e8412005-12-27 08:17:23697</div>
Junio C Hamanoba4b9282008-07-06 05:20:31698<h2 id="_examples">Examples</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23699<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59700<div class="dlist"><dl>
701<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23702gitk v2.6.12.. include/scsi drivers/scsi
703</dt>
704<dd>
705<p>
Junio C Hamano54bf1e22008-12-20 06:30:11706 Show the changes since version <em>v2.6.12</em> that changed any
Junio C Hamano1a4e8412005-12-27 08:17:23707 file in the include/scsi or drivers/scsi subdirectories
708</p>
709</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59710<dt class="hdlist1">
Junio C Hamano1bb569e2006-05-05 23:14:25711gitk --since="2 weeks ago" -- gitk
Junio C Hamano1a4e8412005-12-27 08:17:23712</dt>
713<dd>
714<p>
715 Show the changes during the last two weeks to the file <em>gitk</em>.
716 The "--" is necessary to avoid confusion with the <strong>branch</strong> named
717 <em>gitk</em>
718</p>
719</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59720<dt class="hdlist1">
Junio C Hamano764a6672007-10-23 01:23:31721gitk --max-count=100 --all -- Makefile
Junio C Hamanod5784132006-09-20 21:29:27722</dt>
723<dd>
724<p>
725 Show at most 100 changes made to the file <em>Makefile</em>. Instead of only
726 looking for changes in the current branch look in all branches.
727</p>
728</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31729</dl></div>
Junio C Hamano1a4e8412005-12-27 08:17:23730</div>
Junio C Hamanoba4b9282008-07-06 05:20:31731<h2 id="_files">Files</h2>
Junio C Hamano1bdd3b02008-04-13 05:33:18732<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59733<div class="paragraph"><p>Gitk creates the .gitk file in your $HOME directory to store preferences
Junio C Hamanoba4b9282008-07-06 05:20:31734such as display options, font, and colors.</p></div>
Junio C Hamano1bdd3b02008-04-13 05:33:18735</div>
Junio C Hamanoba4b9282008-07-06 05:20:31736<h2 id="_see_also">SEE ALSO</h2>
Junio C Hamano6b2cee12006-08-26 08:43:31737<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59738<div class="dlist"><dl>
739<dt class="hdlist1">
Junio C Hamano6b2cee12006-08-26 08:43:31740<em>qgit(1)</em>
741</dt>
742<dd>
743<p>
744 A repository browser written in C++ using Qt.
745</p>
746</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59747<dt class="hdlist1">
Junio C Hamano6b2cee12006-08-26 08:43:31748<em>gitview(1)</em>
749</dt>
750<dd>
751<p>
Junio C Hamano68cf15a2010-11-06 01:01:59752 A repository browser written in Python using Gtk. It&#8217;s based on
Junio C Hamano6b2cee12006-08-26 08:43:31753 <em>bzrk(1)</em> and distributed in the contrib area of the git repository.
754</p>
755</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59756<dt class="hdlist1">
Junio C Hamano6b2cee12006-08-26 08:43:31757<em>tig(1)</em>
758</dt>
759<dd>
760<p>
761 A minimal repository browser and git tool output highlighter written
762 in C using Ncurses.
763</p>
764</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31765</dl></div>
Junio C Hamano6b2cee12006-08-26 08:43:31766</div>
Junio C Hamanoba4b9282008-07-06 05:20:31767<h2 id="_git">GIT</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23768<div class="sectionbody">
Junio C Hamanoa28a9202012-06-21 07:08:23769<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23770</div>
Junio C Hamano7bd050f2011-09-22 06:32:22771</div>
772<div id="footnotes"><hr /></div>
Junio C Hamano1a4e8412005-12-27 08:17:23773<div id="footer">
774<div id="footer-text">
Junio C Hamano02194af2011-11-17 20:33:59775Last updated 2011-11-15 13:45:02 PDT
Junio C Hamano1a4e8412005-12-27 08:17:23776</div>
777</div>
778</body>
779</html>