blob: a3108cfab0040bc2aeb075e72a8b63d5354f151b [file] [log] [blame]
Junio C Hamano74640642006-12-27 10:59:551<!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 Hamano68cf15a2010-11-06 01:01:596<meta name="generator" content="AsciiDoc 8.4.5" />
7<title>git-reflog(1)</title>
Junio C Hamano74640642006-12-27 10:59:558<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 Hamano74640642006-12-27 10:59:5527
28em {
29 font-style: italic;
Junio C Hamano68cf15a2010-11-06 01:01:5930 color: navy;
Junio C Hamano74640642006-12-27 10:59:5531}
32
33strong {
34 font-weight: bold;
Junio C Hamano68cf15a2010-11-06 01:01:5935 color: #083194;
Junio C Hamano74640642006-12-27 10:59:5536}
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 Hamano74640642006-12-27 10:59:5551 border-bottom: 2px solid silver;
52}
53h2 {
Junio C Hamano74640642006-12-27 10:59:5554 padding-top: 0.5em;
55}
Junio C Hamanoba4b9282008-07-06 05:20:3156h3 {
57 float: left;
58}
59h3 + * {
60 clear: left;
61}
Junio C Hamano74640642006-12-27 10:59:5562
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 Hamano74640642006-12-27 10:59:5581pre {
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 Hamano74640642006-12-27 10:59:5591}
92span#email {
93}
Junio C Hamano68cf15a2010-11-06 01:01:5994span#revnumber, span#revdate, span#revremark {
Junio C Hamano74640642006-12-27 10:59:5595 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 Hamano74640642006-12-27 10:59:55118div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
119div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
120div.admonitionblock {
Junio C Hamano74640642006-12-27 10:59:55121 margin-top: 1.5em;
122 margin-bottom: 1.5em;
123}
124div.admonitionblock {
125 margin-top: 2.5em;
126 margin-bottom: 2.5em;
127}
128
129div.content { /* Block element content. */
130 padding: 0;
131}
132
133/* Block element titles. */
134div.title, caption.title {
Junio C Hamano68cf15a2010-11-06 01:01:59135 color: #527bbd;
Junio C Hamano74640642006-12-27 10:59:55136 font-family: sans-serif;
137 font-weight: bold;
138 text-align: left;
139 margin-top: 1.0em;
140 margin-bottom: 0.5em;
141}
142div.title + * {
143 margin-top: 0;
144}
145
146td div.title:first-child {
147 margin-top: 0.0em;
148}
149div.content div.title:first-child {
150 margin-top: 0.0em;
151}
152div.content + div.title {
153 margin-top: 0.0em;
154}
155
156div.sidebarblock > div.content {
157 background: #ffffee;
158 border: 1px solid silver;
159 padding: 0.5em;
160}
161
162div.listingblock > div.content {
163 border: 1px solid silver;
164 background: #f4f4f4;
165 padding: 0.5em;
166}
167
Junio C Hamano68cf15a2010-11-06 01:01:59168div.quoteblock {
Junio C Hamano74640642006-12-27 10:59:55169 padding-left: 2.0em;
Junio C Hamano68cf15a2010-11-06 01:01:59170 margin-right: 10%;
Junio C Hamano74640642006-12-27 10:59:55171}
Junio C Hamano68cf15a2010-11-06 01:01:59172div.quoteblock > div.attribution {
173 padding-top: 0.5em;
Junio C Hamano74640642006-12-27 10:59:55174 text-align: right;
175}
Junio C Hamano68cf15a2010-11-06 01:01:59176
177div.verseblock {
178 padding-left: 2.0em;
179 margin-right: 10%;
180}
181div.verseblock > div.content {
182 white-space: pre;
183}
184div.verseblock > div.attribution {
185 padding-top: 0.75em;
186 text-align: left;
187}
188/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
Junio C Hamanoba4b9282008-07-06 05:20:31189div.verseblock + div.attribution {
190 text-align: left;
191}
Junio C Hamano74640642006-12-27 10:59:55192
193div.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;
200}
201div.admonitionblock td.content {
202 padding-left: 0.5em;
203 border-left: 2px solid silver;
204}
205
206div.exampleblock > div.content {
207 border-left: 2px solid silver;
208 padding: 0.5em;
209}
210
Junio C Hamano74640642006-12-27 10:59:55211div.imageblock div.content { padding-left: 0; }
Junio C Hamano74640642006-12-27 10:59:55212span.image img { border-style: none; }
Junio C Hamano68cf15a2010-11-06 01:01:59213a.image:visited { color: white; }
Junio C Hamano74640642006-12-27 10:59:55214
215dl {
216 margin-top: 0.8em;
217 margin-bottom: 0.8em;
218}
219dt {
220 margin-top: 0.5em;
221 margin-bottom: 0;
Junio C Hamano68cf15a2010-11-06 01:01:59222 font-style: normal;
223 color: navy;
Junio C Hamano74640642006-12-27 10:59:55224}
225dd > *:first-child {
Junio C Hamano68cf15a2010-11-06 01:01:59226 margin-top: 0.1em;
Junio C Hamano74640642006-12-27 10:59:55227}
228
229ul, ol {
230 list-style-position: outside;
231}
Junio C Hamano68cf15a2010-11-06 01:01:59232ol.arabic {
233 list-style-type: decimal;
234}
235ol.loweralpha {
Junio C Hamano74640642006-12-27 10:59:55236 list-style-type: lower-alpha;
237}
Junio C Hamano68cf15a2010-11-06 01:01:59238ol.upperalpha {
239 list-style-type: upper-alpha;
240}
241ol.lowerroman {
242 list-style-type: lower-roman;
243}
244ol.upperroman {
245 list-style-type: upper-roman;
246}
247
248div.compact ul, div.compact ol,
249div.compact p, div.compact p,
250div.compact div, div.compact div {
251 margin-top: 0.1em;
252 margin-bottom: 0.1em;
253}
Junio C Hamano74640642006-12-27 10:59:55254
255div.tableblock > table {
Junio C Hamanoba4b9282008-07-06 05:20:31256 border: 3px solid #527bbd;
Junio C Hamano74640642006-12-27 10:59:55257}
258thead {
259 font-family: sans-serif;
260 font-weight: bold;
261}
262tfoot {
263 font-weight: bold;
264}
Junio C Hamano68cf15a2010-11-06 01:01:59265td > div.verse {
266 white-space: pre;
267}
268p.table {
269 margin-top: 0;
270}
271/* Because the table frame attribute is overriden by CSS in most browsers. */
272div.tableblock > table[frame="void"] {
273 border-style: none;
274}
275div.tableblock > table[frame="hsides"] {
276 border-left-style: none;
277 border-right-style: none;
278}
279div.tableblock > table[frame="vsides"] {
280 border-top-style: none;
281 border-bottom-style: none;
282}
Junio C Hamano74640642006-12-27 10:59:55283
Junio C Hamano68cf15a2010-11-06 01:01:59284
285div.hdlist {
Junio C Hamano74640642006-12-27 10:59:55286 margin-top: 0.8em;
287 margin-bottom: 0.8em;
288}
Junio C Hamano68cf15a2010-11-06 01:01:59289div.hdlist tr {
290 padding-bottom: 15px;
Junio C Hamanoba4b9282008-07-06 05:20:31291}
Junio C Hamano68cf15a2010-11-06 01:01:59292dt.hdlist1.strong, td.hdlist1.strong {
293 font-weight: bold;
294}
295td.hdlist1 {
Junio C Hamano74640642006-12-27 10:59:55296 vertical-align: top;
Junio C Hamano68cf15a2010-11-06 01:01:59297 font-style: normal;
Junio C Hamano74640642006-12-27 10:59:55298 padding-right: 0.8em;
Junio C Hamano68cf15a2010-11-06 01:01:59299 color: navy;
Junio C Hamano74640642006-12-27 10:59:55300}
Junio C Hamano68cf15a2010-11-06 01:01:59301td.hdlist2 {
Junio C Hamano74640642006-12-27 10:59:55302 vertical-align: top;
303}
Junio C Hamano68cf15a2010-11-06 01:01:59304div.hdlist.compact tr {
305 margin: 0;
306 padding-bottom: 0;
307}
308
309.comment {
310 background: yellow;
311}
Junio C Hamano74640642006-12-27 10:59:55312
313@media print {
314 div#footer-badges { display: none; }
315}
Junio C Hamanoba4b9282008-07-06 05:20:31316
317div#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;
324}
325
326div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
327 margin-top: 0;
328 margin-bottom: 0;
329}
330div.toclevel2 {
331 margin-left: 2em;
332 font-size: 0.9em;
333}
334div.toclevel3 {
335 margin-left: 4em;
336 font-size: 0.9em;
337}
338div.toclevel4 {
339 margin-left: 6em;
340 font-size: 0.9em;
341}
Junio C Hamano68cf15a2010-11-06 01:01:59342/* Overrides for manpage documents */
343h1 {
344 padding-top: 0.5em;
345 padding-bottom: 0.5em;
346 border-top: 2px solid silver;
347 border-bottom: 2px solid silver;
348}
349h2 {
350 border-style: none;
351}
352div.sectionbody {
353 margin-left: 5%;
354}
355
356@media print {
357 div#toc { display: none; }
358}
359
Junio C Hamano74640642006-12-27 10:59:55360/* Workarounds for IE6's broken and incomplete CSS2. */
361
362div.sidebar-content {
363 background: #ffffee;
364 border: 1px solid silver;
365 padding: 0.5em;
366}
367div.sidebar-title, div.image-title {
Junio C Hamano68cf15a2010-11-06 01:01:59368 color: #527bbd;
Junio C Hamano74640642006-12-27 10:59:55369 font-family: sans-serif;
370 font-weight: bold;
371 margin-top: 0.0em;
372 margin-bottom: 0.5em;
373}
374
375div.listingblock div.content {
376 border: 1px solid silver;
377 background: #f4f4f4;
378 padding: 0.5em;
379}
380
Junio C Hamano68cf15a2010-11-06 01:01:59381div.quoteblock-attribution {
382 padding-top: 0.5em;
383 text-align: right;
384}
385
386div.verseblock-content {
387 white-space: pre;
388}
389div.verseblock-attribution {
390 padding-top: 0.75em;
391 text-align: left;
Junio C Hamano74640642006-12-27 10:59:55392}
393
394div.exampleblock-content {
395 border-left: 2px solid silver;
396 padding-left: 0.5em;
397}
Junio C Hamanoba4b9282008-07-06 05:20:31398
399/* IE6 sets dynamically generated links as visited. */
400div#toc a:visited { color: blue; }
Junio C Hamano74640642006-12-27 10:59:55401</style>
Junio C Hamano74640642006-12-27 10:59:55402</head>
403<body>
404<div id="header">
405<h1>
406git-reflog(1) Manual Page
407</h1>
408<h2>NAME</h2>
409<div class="sectionbody">
410<p>git-reflog -
411 Manage reflog information
412</p>
413</div>
414</div>
Junio C Hamano68cf15a2010-11-06 01:01:59415<h2 id="_synopsis">SYNOPSIS</h2>
Junio C Hamano74640642006-12-27 10:59:55416<div class="sectionbody">
Junio C Hamano15567bc2011-07-23 00:51:59417<div class="verseblock">
418<div class="verseblock-content"><em>git reflog</em> &lt;subcommand&gt; &lt;options&gt;</div>
419<div class="verseblock-attribution">
420</div></div>
Junio C Hamano74640642006-12-27 10:59:55421</div>
Junio C Hamanoba4b9282008-07-06 05:20:31422<h2 id="_description">DESCRIPTION</h2>
Junio C Hamano74640642006-12-27 10:59:55423<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59424<div class="paragraph"><p>The command takes various subcommands, and different options
Junio C Hamanoba4b9282008-07-06 05:20:31425depending on the subcommand:</p></div>
Junio C Hamanod3339982007-02-09 08:38:48426<div class="verseblock">
Junio C Hamano68cf15a2010-11-06 01:01:59427<div class="verseblock-content"><em>git reflog expire</em> [--dry-run] [--stale-fix] [--verbose]
Junio C Hamano9ccf6642010-03-22 01:47:35428 [--expire=&lt;time&gt;] [--expire-unreachable=&lt;time&gt;] [--all] &lt;refs&gt;&#8230;
429<em>git reflog delete</em> ref@{specifier}&#8230;
Junio C Hamano68cf15a2010-11-06 01:01:59430<em>git reflog</em> [<em>show</em>] [log-options] [&lt;ref&gt;]</div>
431<div class="verseblock-attribution">
432</div></div>
433<div class="paragraph"><p>Reflog is a mechanism to record when the tip of branches are
Junio C Hamanoba4b9282008-07-06 05:20:31434updated. This command is to manage the information recorded in it.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59435<div class="paragraph"><p>The subcommand "expire" is used to prune older reflog entries.
Junio C Hamano74640642006-12-27 10:59:55436Entries older than <tt>expire</tt> time, or entries older than
Junio C Hamano54bf1e22008-12-20 06:30:11437<tt>expire-unreachable</tt> time and not reachable from the current
Junio C Hamano74640642006-12-27 10:59:55438tip, are removed from the reflog. This is typically not used
Junio C Hamano68cf15a2010-11-06 01:01:59439directly by the end users&#8201;&#8212;&#8201;instead, see <a href="git-gc.html">git-gc(1)</a>.</p></div>
440<div class="paragraph"><p>The subcommand "show" (which is also the default, in the absence of any
Junio C Hamanod3339982007-02-09 08:38:48441subcommands) will take all the normal log options, and show the log of
Junio C Hamano2e72a942007-11-21 08:54:42442the reference provided in the command-line (or <tt>HEAD</tt>, by default).
443The reflog will cover all recent actions (HEAD reflog records branch switching
Junio C Hamanoba4b9282008-07-06 05:20:31444as well). It is an alias for <tt>git log -g --abbrev-commit --pretty=oneline</tt>;
445see <a href="git-log.html">git-log(1)</a>.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59446<div class="paragraph"><p>The reflog is useful in various git commands, to specify the old value
Junio C Hamano2e72a942007-11-21 08:54:42447of a reference. For example, <tt>HEAD@{2}</tt> means "where HEAD used to be
448two moves ago", <tt>master@{one.week.ago}</tt> means "where master used to
Junio C Hamanoc27b7332010-10-14 04:37:28449point to one week ago", and so on. See <a href="gitrevisions.html">gitrevisions(7)</a> for
Junio C Hamanoba4b9282008-07-06 05:20:31450more details.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59451<div class="paragraph"><p>To delete single entries from the reflog, use the subcommand "delete"
452and specify the <em>exact</em> entry (e.g. "<tt>git reflog delete master@{2}</tt>").</p></div>
Junio C Hamano74640642006-12-27 10:59:55453</div>
Junio C Hamanoba4b9282008-07-06 05:20:31454<h2 id="_options">OPTIONS</h2>
Junio C Hamano74640642006-12-27 10:59:55455<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59456<div class="dlist"><dl>
457<dt class="hdlist1">
Junio C Hamanoee695f22007-06-21 00:35:36458--stale-fix
459</dt>
460<dd>
461<p>
Junio C Hamano68cf15a2010-11-06 01:01:59462 This revamps the logic&#8201;&#8212;&#8201;the definition of "broken commit"
Junio C Hamanoee695f22007-06-21 00:35:36463 becomes: a commit that is not reachable from any of the refs and
464 there is a missing object among the commit, tree, or blob
465 objects reachable from it that is not reachable from any of the
466 refs.
467</p>
Junio C Hamano68cf15a2010-11-06 01:01:59468<div class="paragraph"><p>This computation involves traversing all the reachable objects, i.e. it
Junio C Hamano1aa40d22010-01-21 17:46:43469has the same cost as <em>git prune</em>. Fortunately, once this is run, we
Junio C Hamanoee695f22007-06-21 00:35:36470should not have to ever worry about missing objects, because the current
471prune and pack-objects know about reflogs and protect objects referred by
Junio C Hamanoba4b9282008-07-06 05:20:31472them.</p></div>
Junio C Hamanoee695f22007-06-21 00:35:36473</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59474<dt class="hdlist1">
Junio C Hamano74640642006-12-27 10:59:55475--expire=&lt;time&gt;
476</dt>
477<dd>
478<p>
479 Entries older than this time are pruned. Without the
480 option it is taken from configuration <tt>gc.reflogExpire</tt>,
481 which in turn defaults to 90 days.
482</p>
483</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59484<dt class="hdlist1">
Junio C Hamano74640642006-12-27 10:59:55485--expire-unreachable=&lt;time&gt;
486</dt>
487<dd>
488<p>
Junio C Hamano54bf1e22008-12-20 06:30:11489 Entries older than this time and not reachable from
Junio C Hamano74640642006-12-27 10:59:55490 the current tip of the branch are pruned. Without the
491 option it is taken from configuration
492 <tt>gc.reflogExpireUnreachable</tt>, which in turn defaults to
493 30 days.
494</p>
495</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59496<dt class="hdlist1">
Junio C Hamano74640642006-12-27 10:59:55497--all
498</dt>
499<dd>
500<p>
501 Instead of listing &lt;refs&gt; explicitly, prune all refs.
502</p>
503</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59504<dt class="hdlist1">
Junio C Hamano86bcccc2008-03-08 09:33:55505--updateref
506</dt>
507<dd>
508<p>
509 Update the ref with the sha1 of the top reflog entry (i.e.
510 &lt;ref&gt;@{0}) after expiring or deleting.
511</p>
512</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59513<dt class="hdlist1">
Junio C Hamano86bcccc2008-03-08 09:33:55514--rewrite
515</dt>
516<dd>
517<p>
518 While expiring or deleting, adjust each reflog entry to ensure
519 that the <tt>old</tt> sha1 field points to the <tt>new</tt> sha1 field of the
520 previous entry.
521</p>
522</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59523<dt class="hdlist1">
Junio C Hamano764a6672007-10-23 01:23:31524--verbose
525</dt>
526<dd>
527<p>
528 Print extra information on screen.
529</p>
530</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31531</dl></div>
Junio C Hamano74640642006-12-27 10:59:55532</div>
Junio C Hamanoba4b9282008-07-06 05:20:31533<h2 id="_git">GIT</h2>
Junio C Hamano74640642006-12-27 10:59:55534<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59535<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
Junio C Hamano74640642006-12-27 10:59:55536</div>
537<div id="footer">
538<div id="footer-text">
Junio C Hamano15567bc2011-07-23 00:51:59539Last updated 2011-07-23 00:49:30 UTC
Junio C Hamano74640642006-12-27 10:59:55540</div>
541</div>
542</body>
543</html>