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">
5 <meta http-equiv=
"Content-Type" content=
"text/html; charset=UTF-8" />
6 <meta name=
"generator" content=
"AsciiDoc 8.2.5" />
7 <style type=
"text/css">
9 p
, li
, dt
, dd
, div
, pre
, h1
, h2
, h3
, h4
, h5
, h6
{
11 border: 1px solid red;
16 margin: 1em 5% 1em 5%;
21 text-decoration: underline
;
39 h1
, h2
, h3
, h4
, h5
, h6
{
41 font-family: sans-serif
;
48 border-bottom: 2px solid silver
;
66 border: 1px solid silver
;
81 font-family: sans-serif
;
88 font-family: sans-serif
;
92 font-family: sans-serif
;
94 border-top: 2px solid silver
;
100 padding-bottom: 0.5em;
104 padding-bottom: 0.5em;
108 div
.tableblock
, div
.imageblock
, div
.exampleblock
, div
.verseblock
,
109 div
.quoteblock
, div
.literalblock
, div
.listingblock
, div
.sidebarblock
,
110 div
.admonitionblock
{
113 margin-bottom: 1.5em;
115 div
.admonitionblock
{
117 margin-bottom: 2.5em;
120 div
.content
{ /* Block element content. */
124 /* Block element titles. */
125 div
.title
, caption
.title
{
126 font-family: sans-serif
;
130 margin-bottom: 0.5em;
136 td div
.title:first-child
{
139 div
.content div
.title:first-child
{
142 div
.content
+ div
.title
{
146 div
.sidebarblock
> div
.content
{
148 border: 1px solid silver
;
155 div
.listingblock
> div
.content
{
156 border: 1px solid silver
;
161 div
.quoteblock
> div
.content
{
168 div
.verseblock
+ div
.attribution
{
172 div
.admonitionblock
.icon
{
176 text-decoration: underline
;
178 padding-right: 0.5em;
180 div
.admonitionblock td
.content
{
182 border-left: 2px solid silver
;
185 div
.exampleblock
> div
.content
{
186 border-left: 2px solid silver
;
190 div
.verseblock div
.content
{
194 div
.imageblock div
.content
{ padding-left: 0; }
195 div
.imageblock img
{ border: 1px solid silver
; }
196 span
.image img
{ border-style: none
; }
200 margin-bottom: 0.8em;
212 list-style-position: outside
;
215 list-style-type: lower-alpha
;
218 div
.tableblock
> table
{
219 border: 3px solid
#527bbd;
222 font-family: sans-serif
;
231 margin-bottom: 0.8em;
239 padding-right: 0.8em;
246 div#footer-badges
{ display: none
; }
251 font-family: sans-serif
;
255 margin-bottom: 0.1em;
258 div
.toclevel1
, div
.toclevel2
, div
.toclevel3
, div
.toclevel4
{
274 include1::./stylesheets
/xhtml11-manpage
.css
[]
275 /* Workarounds for IE6's broken and incomplete CSS2. */
277 div
.sidebar-content
{
279 border: 1px solid silver
;
282 div
.sidebar-title
, div
.image-title
{
283 font-family: sans-serif
;
286 margin-bottom: 0.5em;
289 div
.listingblock div
.content
{
290 border: 1px solid silver
;
295 div
.quoteblock-content
{
299 div
.exampleblock-content
{
300 border-left: 2px solid silver
;
304 /* IE6 sets dynamically generated links as visited. */
305 div#toc
a:visited
{ color: blue
; }
307 <title>gitrevisions(
7)
</title>
312 gitrevisions(
7) Manual Page
315 <div class=
"sectionbody">
317 specifying revisions and ranges for git
322 <div class=
"sectionbody">
323 <div class=
"para"><p>gitrevisions
</p></div>
325 <h2 id=
"_description">DESCRIPTION
</h2>
326 <div class=
"sectionbody">
327 <div class=
"para"><p>Many Git commands take revision parameters as arguments. Depending on
328 the command, they denote a specific commit or, for commands which
329 walk the revision graph (such as
<a href=
"git-log.html">git-log(
1)
</a>), all commits which can
330 be reached from that commit. In the latter case one can also specify a
331 range of revisions explicitly.
</p></div>
332 <div class=
"para"><p>In addition, some Git commands (such as
<a href=
"git-show.html">git-show(
1)
</a>) also take
333 revision parameters which denote other objects than commits, e.g. blobs
334 (
"files") or trees (
"directories of files").
</p></div>
336 <h2 id=
"_specifying_revisions">SPECIFYING REVISIONS
</h2>
337 <div class=
"sectionbody">
338 <div class=
"para"><p>A revision parameter typically, but not necessarily, names a
339 commit object. They use what is called an
<em>extended SHA1
</em>
340 syntax. Here are various ways to spell object names. The
341 ones listed near the end of this list are to name trees and
342 blobs contained in a commit.
</p></div>
343 <div class=
"ilist"><ul>
346 The full SHA1 object name (
40-byte hexadecimal string), or
347 a substring of such that is unique within the repository.
348 E.g. dae86e1950b1277e545cee180551750029cfe735 and dae86e both
349 name the same commit object if there are no other object in
350 your repository whose object name starts with dae86e.
355 An output from
<em>git describe
</em>; i.e. a closest tag, optionally
356 followed by a dash and a number of commits, followed by a dash, a
357 <tt>g
</tt>, and an abbreviated object name.
362 A symbolic ref name. E.g.
<em>master
</em> typically means the commit
363 object referenced by refs/heads/master. If you
364 happen to have both heads/master and tags/master, you can
365 explicitly say
<em>heads/master
</em> to tell git which one you mean.
366 When ambiguous, a
<tt><name
></tt> is disambiguated by taking the
367 first match in the following rules:
369 <div class=
"olist"><ol>
372 if
<tt>$GIT_DIR/
<name
></tt> exists, that is what you mean (this is usually
373 useful only for
<tt>HEAD
</tt>,
<tt>FETCH_HEAD
</tt>,
<tt>ORIG_HEAD
</tt> and
<tt>MERGE_HEAD
</tt>);
378 otherwise,
<tt>refs/
<name
></tt> if exists;
383 otherwise,
<tt>refs/tags/
<name
></tt> if exists;
388 otherwise,
<tt>refs/heads/
<name
></tt> if exists;
393 otherwise,
<tt>refs/remotes/
<name
></tt> if exists;
398 otherwise,
<tt>refs/remotes/
<name
>/HEAD
</tt> if exists.
400 <div class=
"para"><p>HEAD names the commit your changes in the working tree is based on.
401 FETCH_HEAD records the branch you fetched from a remote repository
402 with your last
<em>git fetch
</em> invocation.
403 ORIG_HEAD is created by commands that moves your HEAD in a drastic
404 way, to record the position of the HEAD before their operation, so that
405 you can change the tip of the branch back to the state before you ran
407 MERGE_HEAD records the commit(s) you are merging into your branch
408 when you run
<em>git merge
</em>.
</p></div>
409 <div class=
"para"><p>Note that any of the
<tt>refs/*
</tt> cases above may come either from
410 the
<tt>$GIT_DIR/refs
</tt> directory or from the
<tt>$GIT_DIR/packed-refs
</tt> file.
</p></div>
416 A ref followed by the suffix
<em>@
</em> with a date specification
418 pair (e.g.
<em>{yesterday}
</em>,
<em>{
1 month
2 weeks
3 days
1 hour
1
419 second ago}
</em> or
<em>{
1979-
02-
26 18:
30:
00}
</em>) to specify the value
420 of the ref at a prior point in time. This suffix may only be
421 used immediately following a ref name and the ref must have an
422 existing log ($GIT_DIR/logs/
<ref
>). Note that this looks up the state
423 of your
<strong>local
</strong> ref at a given time; e.g., what was in your local
424 <tt>master
</tt> branch last week. If you want to look at commits made during
425 certain times, see
<tt>--since
</tt> and
<tt>--until
</tt>.
430 A ref followed by the suffix
<em>@
</em> with an ordinal specification
431 enclosed in a brace pair (e.g.
<em>{
1}
</em>,
<em>{
15}
</em>) to specify
432 the n-th prior value of that ref. For example
<em>master@{
1}
</em>
433 is the immediate prior value of
<em>master
</em> while
<em>master@{
5}
</em>
434 is the
5th prior value of
<em>master
</em>. This suffix may only be used
435 immediately following a ref name and the ref must have an existing
436 log ($GIT_DIR/logs/
<ref
>).
441 You can use the
<em>@
</em> construct with an empty ref part to get at a
442 reflog of the current branch. For example, if you are on the
443 branch
<em>blabla
</em>, then
<em>@{
1}
</em> means the same as
<em>blabla@{
1}
</em>.
448 The special construct
<em>@{-
<n
>}
</em> means the
<n
>th branch checked out
449 before the current one.
454 The suffix
<em>@{upstream}
</em> to a ref (short form
<em>ref@{u}
</em>) refers to
455 the branch the ref is set to build on top of. Missing ref defaults
456 to the current branch.
461 A suffix
<em>^</em> to a revision parameter (e.g.
<em>HEAD
^</em>) means the first parent of
462 that commit object.
<em>^<n
></em> means the
<n
>th parent (i.e.
464 is equivalent to
<em>rev
^1</em>). As a special rule,
465 <em>rev
^0</em> means the commit itself and is used when
<em>rev
</em> is the
466 object name of a tag object that refers to a commit object.
471 A suffix
<em>~<n
></em> to a revision parameter means the commit
472 object that is the
<n
>th generation grand-parent of the named
473 commit object, following only the first parent. I.e. rev~
3 is
474 equivalent to rev
^^^ which is equivalent to
475 rev
^1^1^1. See below for a illustration of
476 the usage of this form.
481 A suffix
<em>^</em> followed by an object type name enclosed in
482 brace pair (e.g.
<tt>v0.99
.8^{commit}
</tt>) means the object
483 could be a tag, and dereference the tag recursively until an
484 object of that type is found or the object cannot be
485 dereferenced anymore (in which case, barf).
<tt>rev
^0</tt>
486 introduced earlier is a short-hand for
<tt>rev
^{commit}
</tt>.
491 A suffix
<em>^</em> followed by an empty brace pair
492 (e.g.
<tt>v0.99
.8^{}
</tt>) means the object could be a tag,
493 and dereference the tag recursively until a non-tag object is
499 A colon, followed by a slash, followed by a text (e.g.
<tt>:/fix nasty bug
</tt>): this names
500 a commit whose commit message matches the specified regular expression.
501 This name returns the youngest matching commit which is
502 reachable from any ref. If the commit message starts with a
503 <em>!
</em>, you have to repeat that; the special sequence
<em>:/!
</em>,
504 followed by something else than
<em>!
</em> is reserved for now.
505 The regular expression can match any part of the commit message. To
506 match messages starting with a string, one can use e.g.
<tt>:/^foo
</tt>.
511 A suffix
<em>:
</em> followed by a path (e.g.
<tt>HEAD:README
</tt>); this names the blob or tree
512 at the given path in the tree-ish object named by the part
514 <em>:path
</em> (with an empty part before the colon, e.g.
<tt>:README
</tt>)
515 is a special case of the syntax described next: content
516 recorded in the index at the given path.
521 A colon, optionally followed by a stage number (
0 to
3) and a
522 colon, followed by a path (e.g.
<tt>:
0:README
</tt>); this names a blob object in the
523 index at the given path. Missing stage number (and the colon
524 that follows it, e.g.
<tt>:README
</tt>) names a stage
0 entry. During a merge, stage
525 1 is the common ancestor, stage
2 is the target branch's version
526 (typically the current branch), and stage
3 is the version from
527 the branch being merged.
531 <div class=
"para"><p>Here is an illustration, by Jon Loeliger. Both commit nodes B
532 and C are parents of commit node A. Parent commits are ordered
533 left-to-right.
</p></div>
534 <div class=
"literalblock">
535 <div class=
"content">
547 <div class=
"literalblock">
548 <div class=
"content">
552 D = A^^ = A^
1^
1 = A~
2
555 G = A^^^ = A^
1^
1^
1 = A~
3
556 H = D^
2 = B^^
2 = A^^^
2 = A~
2^
2
557 I = F^ = B^
3^ = A^^
3^
558 J = F^
2 = B^
3^
2 = A^^
3^
2</tt></pre>
561 <h2 id=
"_specifying_ranges">SPECIFYING RANGES
</h2>
562 <div class=
"sectionbody">
563 <div class=
"para"><p>History traversing commands such as
<em>git log
</em> operate on a set
564 of commits, not just a single commit. To these commands,
565 specifying a single revision with the notation described in the
566 previous section means the set of commits reachable from that
567 commit, following the commit ancestry chain.
</p></div>
568 <div class=
"para"><p>To exclude commits reachable from a commit, a prefix
<tt>^</tt>
569 notation is used. E.g.
<tt>^r1 r2
</tt> means commits reachable
570 from
<tt>r2
</tt> but exclude the ones reachable from
<tt>r1
</tt>.
</p></div>
571 <div class=
"para"><p>This set operation appears so often that there is a shorthand
572 for it. When you have two commits
<tt>r1
</tt> and
<tt>r2
</tt> (named according
573 to the syntax explained in SPECIFYING REVISIONS above), you can ask
574 for commits that are reachable from r2 excluding those that are reachable
575 from r1 by
<tt>^r1 r2
</tt> and it can be written as
<tt>r1..r2
</tt>.
</p></div>
576 <div class=
"para"><p>A similar notation
<tt>r1...r2
</tt> is called symmetric difference
577 of
<tt>r1
</tt> and
<tt>r2
</tt> and is defined as
578 <tt>r1 r2 --not $(git merge-base --all r1 r2)
</tt>.
579 It is the set of commits that are reachable from either one of
580 <tt>r1
</tt> or
<tt>r2
</tt> but not from both.
</p></div>
581 <div class=
"para"><p>Two other shorthands for naming a set that is formed by a commit
582 and its parent commits exist. The
<tt>r1
^@
</tt> notation means all
583 parents of
<tt>r1
</tt>.
<tt>r1
^!
</tt> includes commit
<tt>r1
</tt> but excludes
584 all of its parents.
</p></div>
585 <div class=
"para"><p>Here are a handful of examples:
</p></div>
586 <div class=
"literalblock">
587 <div class=
"content">
595 F^! D G H D F
</tt></pre>
598 <h2 id=
"_see_also">SEE ALSO
</h2>
599 <div class=
"sectionbody">
600 <div class=
"para"><p><a href=
"git-rev-parse.html">git-rev-parse(
1)
</a></p></div>
602 <h2 id=
"_git">GIT
</h2>
603 <div class=
"sectionbody">
604 <div class=
"para"><p>Part of the
<a href=
"git.html">git(
1)
</a> suite
</p></div>
607 <div id=
"footer-text">
608 Last updated
2010-
09-
28 05:
49:
38 UTC