1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
\r
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
\r
3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
\r
5 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
\r
6 <meta name="generator" content="AsciiDoc 7.0.2" />
\r
7 <style type="text/css">
\r
9 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
\r
11 border: 1px solid red;
\r
16 margin: 1em 5% 1em 5%;
\r
20 a:visited { color: fuchsia; }
\r
34 h1, h2, h3, h4, h5, h6 {
\r
36 font-family: sans-serif;
\r
38 margin-bottom: 0.5em;
\r
43 border-bottom: 2px solid silver;
\r
46 border-bottom: 2px solid silver;
\r
56 border: 1px solid silver;
\r
61 margin-bottom: 0.5em;
\r
71 font-family: sans-serif;
\r
78 font-family: sans-serif;
\r
82 font-family: sans-serif;
\r
84 border-top: 2px solid silver;
\r
90 padding-bottom: 0.5em;
\r
94 padding-bottom: 0.5em;
\r
98 div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
\r
99 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
\r
100 div.admonitionblock {
\r
103 margin-bottom: 1.5em;
\r
105 div.admonitionblock {
\r
107 margin-bottom: 2.5em;
\r
110 div.content { /* Block element content. */
\r
114 /* Block element titles. */
\r
115 div.title, caption.title {
\r
116 font-family: sans-serif;
\r
120 margin-bottom: 0.5em;
\r
126 td div.title:first-child {
\r
129 div.content div.title:first-child {
\r
132 div.content + div.title {
\r
136 div.sidebarblock > div.content {
\r
137 background: #ffffee;
\r
138 border: 1px solid silver;
\r
142 div.listingblock > div.content {
\r
143 border: 1px solid silver;
\r
144 background: #f4f4f4;
\r
148 div.quoteblock > div.content {
\r
149 padding-left: 2.0em;
\r
151 div.quoteblock .attribution {
\r
155 div.admonitionblock .icon {
\r
156 vertical-align: top;
\r
159 text-decoration: underline;
\r
161 padding-right: 0.5em;
\r
163 div.admonitionblock td.content {
\r
164 padding-left: 0.5em;
\r
165 border-left: 2px solid silver;
\r
168 div.exampleblock > div.content {
\r
169 border-left: 2px solid silver;
\r
173 div.verseblock div.content {
\r
177 div.imageblock div.content { padding-left: 0; }
\r
178 div.imageblock img { border: 1px solid silver; }
\r
179 span.image img { border-style: none; }
\r
183 margin-bottom: 0.8em;
\r
188 font-style: italic;
\r
190 dd > *:first-child {
\r
195 list-style-position: outside;
\r
198 list-style-type: lower-alpha;
\r
201 div.tableblock > table {
\r
202 border-color: #527bbd;
\r
206 font-family: sans-serif;
\r
215 margin-bottom: 0.8em;
\r
218 vertical-align: top;
\r
219 font-style: italic;
\r
220 padding-right: 0.8em;
\r
223 vertical-align: top;
\r
227 div#footer-badges { display: none; }
\r
229 /* Workarounds for IE6's broken and incomplete CSS2. */
\r
231 div.sidebar-content {
\r
232 background: #ffffee;
\r
233 border: 1px solid silver;
\r
236 div.sidebar-title, div.image-title {
\r
237 font-family: sans-serif;
\r
240 margin-bottom: 0.5em;
\r
243 div.listingblock div.content {
\r
244 border: 1px solid silver;
\r
245 background: #f4f4f4;
\r
249 div.quoteblock-content {
\r
250 padding-left: 2.0em;
\r
253 div.exampleblock-content {
\r
254 border-left: 2px solid silver;
\r
255 padding-left: 0.5em;
\r
258 <title>GIT Glossary</title>
\r
262 <h1>GIT Glossary</h1>
\r
264 <div id="preamble">
\r
265 <div class="sectionbody">
\r
266 <p>This list is sorted alphabetically:</p>
\r
269 <a id="ref_alternate_object_database"></a>alternate object database
\r
273 Via the alternates mechanism, a <a href="#ref_repository">repository</a> can
\r
274 inherit part of its <a href="#ref_object_database">object database</a> from another
\r
275 <a href="#ref_object_database">object database</a>, which is called "alternate".
\r
279 <a id="ref_bare_repository"></a>bare repository
\r
283 A <a href="#ref_bare_repository">bare repository</a> is normally an appropriately
\r
284 named <a href="#ref_directory">directory</a> with a <tt>.git</tt> suffix that does not
\r
285 have a locally checked-out copy of any of the files under
\r
286 <a href="#ref_revision">revision</a> control. That is, all of the <tt>git</tt>
\r
287 administrative and control files that would normally be present in the
\r
288 hidden <tt>.git</tt> sub-<a href="#ref_directory">directory</a> are directly present in
\r
289 the <tt><a href="#ref_repository">repository</a>.git</tt> <a href="#ref_directory">directory</a>
\r
290 instead, and no other files are present and checked out. Usually
\r
291 publishers of public repositories make bare repositories available.
\r
295 <a id="ref_blob_object"></a>blob object
\r
299 Untyped <a href="#ref_object">object</a>, e.g. the contents of a file.
\r
303 <a id="ref_branch"></a>branch
\r
307 A non-cyclical graph of revisions, i.e. the complete history of a
\r
308 particular <a href="#ref_revision">revision</a>, which is called the
\r
309 <a href="#ref_branch">branch</a> <a href="#ref_head">head</a>. The <a href="#ref_branch">branch</a> heads
\r
310 are stored in <tt>$GIT_DIR/refs/heads/</tt>.
\r
314 <a id="ref_cache"></a>cache
\r
318 Obsolete for: <a href="#ref_index">index</a>.
\r
322 <a id="ref_chain"></a>chain
\r
326 A list of objects, where each <a href="#ref_object">object</a> in the list contains
\r
327 a reference to its successor (for example, the successor of a
\r
328 <a href="#ref_commit">commit</a> could be one of its parents).
\r
332 <a id="ref_changeset"></a>changeset
\r
336 BitKeeper/cvsps speak for "<a href="#ref_commit">commit</a>". Since git does not
\r
337 store changes, but states, it really does not make sense to use the term
\r
338 "changesets" with git.
\r
342 <a id="ref_checkout"></a>checkout
\r
346 The action of updating the <a href="#ref_working_tree">working tree</a> to a
\r
347 <a href="#ref_revision">revision</a> which was stored in the
\r
348 <a href="#ref_object_database">object database</a>.
\r
352 <a id="ref_cherry-picking"></a>cherry-picking
\r
356 In <a href="#ref_SCM">SCM</a> jargon, "cherry pick" means to choose a subset of
\r
357 changes out of a series of changes (typically commits) and record them
\r
358 as a new series of changes on top of different codebase. In GIT, this is
\r
359 performed by "git cherry-pick" command to extract the change introduced
\r
360 by an existing <a href="#ref_commit">commit</a> and to record it based on the tip
\r
361 of the current <a href="#ref_branch">branch</a> as a new <a href="#ref_commit">commit</a>.
\r
365 <a id="ref_clean"></a>clean
\r
369 A <a href="#ref_working_tree">working tree</a> is <a href="#ref_clean">clean</a>, if it
\r
370 corresponds to the <a href="#ref_revision">revision</a> referenced by the current
\r
371 <a href="#ref_head">head</a>. Also see "<a href="#ref_dirty">dirty</a>".
\r
375 <a id="ref_commit"></a>commit
\r
379 As a verb: The action of storing the current state of the
\r
380 <a href="#ref_index">index</a> in the <a href="#ref_object_database">object database</a>. The
\r
381 result is a <a href="#ref_revision">revision</a>. As a noun: Short hand for
\r
382 <a href="#ref_commit_object">commit object</a>.
\r
386 <a id="ref_commit_object"></a>commit object
\r
390 An <a href="#ref_object">object</a> which contains the information about a
\r
391 particular <a href="#ref_revision">revision</a>, such as parents, committer,
\r
392 author, date and the <a href="#ref_tree_object">tree object</a> which corresponds
\r
393 to the top <a href="#ref_directory">directory</a> of the stored
\r
394 <a href="#ref_revision">revision</a>.
\r
398 <a id="ref_core_git"></a>core git
\r
402 Fundamental data structures and utilities of git. Exposes only limited
\r
403 source code management tools.
\r
407 <a id="ref_DAG"></a>DAG
\r
411 Directed acyclic graph. The <a href="#ref_commit">commit</a> objects form a
\r
412 directed acyclic graph, because they have parents (directed), and the
\r
413 graph of <a href="#ref_commit">commit</a> objects is acyclic (there is no
\r
414 <a href="#ref_chain">chain</a> which begins and ends with the same
\r
415 <a href="#ref_object">object</a>).
\r
419 <a id="ref_dircache"></a>dircache
\r
423 You are <strong>waaaaay</strong> behind.
\r
427 <a id="ref_directory"></a>directory
\r
431 The list you get with "ls" :-)
\r
435 <a id="ref_dirty"></a>dirty
\r
439 A <a href="#ref_working_tree">working tree</a> is said to be <a href="#ref_dirty">dirty</a> if
\r
440 it contains modifications which have not been committed to the current
\r
441 <a href="#ref_branch">branch</a>.
\r
445 <a id="ref_ent"></a>ent
\r
449 Favorite synonym to "<a href="#ref_tree-ish">tree-ish</a>" by some total geeks. See
\r
450 <tt>http://en.wikipedia.org/wiki/Ent_(Middle-earth)</tt> for an in-depth
\r
455 <a id="ref_fast_forward"></a>fast forward
\r
459 A fast-forward is a special type of <a href="#ref_merge">merge</a> where you have a
\r
460 <a href="#ref_revision">revision</a> and you are "merging" another
\r
461 <a href="#ref_branch">branch</a>'s changes that happen to be a descendant of what
\r
462 you have. In such these cases, you do not make a new <a href="#ref_merge">merge</a>
\r
463 <a href="#ref_commit">commit</a> but instead just update to his
\r
464 <a href="#ref_revision">revision</a>. This will happen frequently on a
\r
465 <a href="#ref_tracking_branch">tracking branch</a> of a remote
\r
466 <a href="#ref_repository">repository</a>.
\r
470 <a id="ref_fetch"></a>fetch
\r
474 Fetching a <a href="#ref_branch">branch</a> means to get the
\r
475 <a href="#ref_branch">branch</a>'s <a href="#ref_head_ref">head ref</a> from a remote
\r
476 <a href="#ref_repository">repository</a>, to find out which objects are missing
\r
477 from the local <a href="#ref_object_database">object database</a>, and to get them,
\r
482 <a id="ref_file_system"></a>file system
\r
486 Linus Torvalds originally designed git to be a user space file system,
\r
487 i.e. the infrastructure to hold files and directories. That ensured the
\r
488 efficiency and speed of git.
\r
492 <a id="ref_git_archive"></a>git archive
\r
496 Synonym for <a href="#ref_repository">repository</a> (for arch people).
\r
500 <a id="ref_grafts"></a>grafts
\r
504 Grafts enables two otherwise different lines of development to be joined
\r
505 together by recording fake ancestry information for commits. This way
\r
506 you can make git pretend the set of parents a <a href="#ref_commit">commit</a> has
\r
507 is different from what was recorded when the <a href="#ref_commit">commit</a> was
\r
508 created. Configured via the <tt>.git/info/<a href="#ref_grafts">grafts</a></tt> file.
\r
512 <a id="ref_hash"></a>hash
\r
516 In git's context, synonym to <a href="#ref_object_name">object name</a>.
\r
520 <a id="ref_head"></a>head
\r
524 The top of a <a href="#ref_branch">branch</a>. It contains a <a href="#ref_ref">ref</a> to the
\r
525 corresponding <a href="#ref_commit_object">commit object</a>.
\r
529 <a id="ref_head_ref"></a>head ref
\r
533 A <a href="#ref_ref">ref</a> pointing to a <a href="#ref_head">head</a>. Often, this is
\r
534 abbreviated to "<a href="#ref_head">head</a>". Head refs are stored in
\r
535 <tt>$GIT_DIR/refs/heads/</tt>.
\r
539 <a id="ref_hook"></a>hook
\r
543 During the normal execution of several git commands, call-outs are made
\r
544 to optional scripts that allow a developer to add functionality or
\r
545 checking. Typically, the hooks allow for a command to be pre-verified
\r
546 and potentially aborted, and allow for a post-notification after the
\r
547 operation is done. The <a href="#ref_hook">hook</a> scripts are found in the
\r
548 <tt>$GIT_DIR/hooks/</tt> <a href="#ref_directory">directory</a>, and are enabled by simply
\r
549 making them executable.
\r
553 <a id="ref_index"></a>index
\r
557 A collection of files with stat information, whose contents are stored
\r
558 as objects. The <a href="#ref_index">index</a> is a stored version of your working
\r
559 <a href="#ref_tree">tree</a>. Truth be told, it can also contain a second, and even
\r
560 a third version of a <a href="#ref_working_tree">working tree</a>, which are used
\r
565 <a id="ref_index_entry"></a>index entry
\r
569 The information regarding a particular file, stored in the
\r
570 <a href="#ref_index">index</a>. An <a href="#ref_index_entry">index entry</a> can be unmerged,
\r
571 if a <a href="#ref_merge">merge</a> was started, but not yet finished (i.e. if the
\r
572 <a href="#ref_index">index</a> contains multiple versions of that file).
\r
576 <a id="ref_master"></a>master
\r
580 The default development <a href="#ref_branch">branch</a>. Whenever you create a git
\r
581 <a href="#ref_repository">repository</a>, a <a href="#ref_branch">branch</a> named
\r
582 "<a href="#ref_master">master</a>" is created, and becomes the active
\r
583 <a href="#ref_branch">branch</a>. In most cases, this contains the local
\r
584 development, though that is purely conventional and not required.
\r
588 <a id="ref_merge"></a>merge
\r
592 To <a href="#ref_merge">merge</a> branches means to try to accumulate the changes
\r
593 since a common ancestor and apply them to the first
\r
594 <a href="#ref_branch">branch</a>. An automatic <a href="#ref_merge">merge</a> uses heuristics
\r
595 to accomplish that. Evidently, an automatic <a href="#ref_merge">merge</a> can
\r
600 <a id="ref_object"></a>object
\r
604 The unit of storage in git. It is uniquely identified by the
\r
605 <a href="#ref_SHA1">SHA1</a> of its contents. Consequently, an
\r
606 <a href="#ref_object">object</a> can not be changed.
\r
610 <a id="ref_object_database"></a>object database
\r
614 Stores a set of "objects", and an individual <a href="#ref_object">object</a> is
\r
615 identified by its <a href="#ref_object_name">object name</a>. The objects usually
\r
616 live in <tt>$GIT_DIR/objects/</tt>.
\r
620 <a id="ref_object_identifier"></a>object identifier
\r
624 Synonym for <a href="#ref_object_name">object name</a>.
\r
628 <a id="ref_object_name"></a>object name
\r
632 The unique identifier of an <a href="#ref_object">object</a>. The <a href="#ref_hash">hash</a>
\r
633 of the <a href="#ref_object">object</a>'s contents using the Secure Hash Algorithm
\r
634 1 and usually represented by the 40 character hexadecimal encoding of
\r
635 the <a href="#ref_hash">hash</a> of the <a href="#ref_object">object</a> (possibly followed by
\r
640 <a id="ref_octopus"></a>octopus
\r
644 To <a href="#ref_merge">merge</a> more than two branches. Also denotes an
\r
645 intelligent predator.
\r
649 <a id="ref_origin"></a>origin
\r
653 The default upstream <a href="#ref_tracking_branch">tracking branch</a>. Most
\r
654 projects have at least one upstream project which they track. By default
\r
655 <em><a href="#ref_origin">origin</a></em> is used for that purpose. New upstream updates
\r
656 will be fetched into this <a href="#ref_branch">branch</a>; you should never
\r
657 <a href="#ref_commit">commit</a> to it yourself.
\r
661 <a id="ref_pack"></a>pack
\r
665 A set of objects which have been compressed into one file (to save space
\r
666 or to transmit them efficiently).
\r
670 <a id="ref_pack_index"></a>pack index
\r
674 The list of identifiers, and other information, of the objects in a
\r
675 <a href="#ref_pack">pack</a>, to assist in efficiently accessing the contents of a
\r
676 <a href="#ref_pack">pack</a>.
\r
680 <a id="ref_parent"></a>parent
\r
684 A <a href="#ref_commit_object">commit object</a> contains a (possibly empty) list
\r
685 of the logical predecessor(s) in the line of development, i.e. its
\r
690 <a id="ref_pickaxe"></a>pickaxe
\r
694 The term <a href="#ref_pickaxe">pickaxe</a> refers to an option to the diffcore
\r
695 routines that help select changes that add or delete a given text
\r
696 string. With the —<a href="#ref_pickaxe">pickaxe</a>-all option, it can be used to
\r
697 view the full <a href="#ref_changeset">changeset</a> that introduced or removed,
\r
698 say, a particular line of text. See <a href="git-diff.html">git-diff(1)</a>.
\r
702 <a id="ref_plumbing"></a>plumbing
\r
706 Cute name for <a href="#ref_core_git">core git</a>.
\r
710 <a id="ref_porcelain"></a>porcelain
\r
714 Cute name for programs and program suites depending on
\r
715 <a href="#ref_core_git">core git</a>, presenting a high level access to
\r
716 <a href="#ref_core_git">core git</a>. Porcelains expose more of a <a href="#ref_SCM">SCM</a>
\r
717 interface than the <a href="#ref_plumbing">plumbing</a>.
\r
721 <a id="ref_pull"></a>pull
\r
725 Pulling a <a href="#ref_branch">branch</a> means to <a href="#ref_fetch">fetch</a> it and
\r
726 <a href="#ref_merge">merge</a> it.
\r
730 <a id="ref_push"></a>push
\r
734 Pushing a <a href="#ref_branch">branch</a> means to get the <a href="#ref_branch">branch</a>'s
\r
735 <a href="#ref_head_ref">head ref</a> from a remote <a href="#ref_repository">repository</a>,
\r
736 find out if it is an ancestor to the <a href="#ref_branch">branch</a>'s local
\r
737 <a href="#ref_head_ref">head ref</a> is a direct, and in that case, putting all
\r
738 objects, which are <a href="#ref_reachable">reachable</a> from the local
\r
739 <a href="#ref_head_ref">head ref</a>, and which are missing from the remote
\r
740 <a href="#ref_repository">repository</a>, into the remote
\r
741 <a href="#ref_object_database">object database</a>, and updating the remote
\r
742 <a href="#ref_head_ref">head ref</a>. If the remote <a href="#ref_head">head</a> is not an
\r
743 ancestor to the local <a href="#ref_head">head</a>, the <a href="#ref_push">push</a> fails.
\r
747 <a id="ref_reachable"></a>reachable
\r
751 An <a href="#ref_object">object</a> is <a href="#ref_reachable">reachable</a> from a
\r
752 <a href="#ref_ref">ref</a>/<a href="#ref_commit">commit</a>/<a href="#ref_tree">tree</a>/<a href="#ref_tag">tag</a>,
\r
753 if there is a <a href="#ref_chain">chain</a> leading from the latter to the former.
\r
757 <a id="ref_rebase"></a>rebase
\r
761 To <a href="#ref_clean">clean</a> a <a href="#ref_branch">branch</a> by starting from the
\r
762 <a href="#ref_head">head</a> of the main line of development
\r
763 ("<a href="#ref_master">master</a>"), and reapply the (possibly cherry-picked)
\r
764 changes from that <a href="#ref_branch">branch</a>.
\r
768 <a id="ref_ref"></a>ref
\r
772 A 40-byte hex representation of a <a href="#ref_SHA1">SHA1</a> or a name that
\r
773 denotes a particular <a href="#ref_object">object</a>. These may be stored in
\r
774 <tt>$GIT_DIR/refs/</tt>.
\r
778 <a id="ref_refspec"></a>refspec
\r
782 A <a href="#ref_refspec">refspec</a> is used by <a href="#ref_fetch">fetch</a> and
\r
783 <a href="#ref_push">push</a> to describe the mapping between remote <a href="#ref_ref">ref</a>
\r
784 and local <a href="#ref_ref">ref</a>. They are combined with a colon in the format
\r
785 <src>:<dst>, preceded by an optional plus sign, +. For example: <tt>git
\r
786 <a href="#ref_fetch">fetch</a> $URL
\r
787 refs/heads/<a href="#ref_master">master</a>:refs/heads/<a href="#ref_origin">origin</a></tt> means
\r
788 "grab the <a href="#ref_master">master</a> <a href="#ref_branch">branch</a> <a href="#ref_head">head</a>
\r
789 from the $URL and store it as my <a href="#ref_origin">origin</a>
\r
790 <a href="#ref_branch">branch</a> <a href="#ref_head">head</a>". And <tt>git <a href="#ref_push">push</a>
\r
791 $URL refs/heads/<a href="#ref_master">master</a>:refs/heads/to-upstream</tt> means
\r
792 "publish my <a href="#ref_master">master</a> <a href="#ref_branch">branch</a>
\r
793 <a href="#ref_head">head</a> as to-upstream <a href="#ref_master">master</a> <a href="#ref_head">head</a>
\r
794 at $URL". See also <a href="git-push.html">git-push(1)</a>
\r
798 <a id="ref_repository"></a>repository
\r
802 A collection of refs together with an <a href="#ref_object_database">object database</a> containing all objects, which are <a href="#ref_reachable">reachable</a>
\r
803 from the refs, possibly accompanied by meta data from one or more
\r
804 porcelains. A <a href="#ref_repository">repository</a> can share an
\r
805 <a href="#ref_object_database">object database</a> with other repositories.
\r
809 <a id="ref_resolve"></a>resolve
\r
813 The action of fixing up manually what a failed automatic
\r
814 <a href="#ref_merge">merge</a> left behind.
\r
818 <a id="ref_revision"></a>revision
\r
822 A particular state of files and directories which was stored in the
\r
823 <a href="#ref_object_database">object database</a>. It is referenced by a
\r
824 <a href="#ref_commit_object">commit object</a>.
\r
828 <a id="ref_rewind"></a>rewind
\r
832 To throw away part of the development, i.e. to assign the
\r
833 <a href="#ref_head">head</a> to an earlier <a href="#ref_revision">revision</a>.
\r
837 <a id="ref_SCM"></a>SCM
\r
841 Source code management (tool).
\r
845 <a id="ref_SHA1"></a>SHA1
\r
849 Synonym for <a href="#ref_object_name">object name</a>.
\r
853 <a id="ref_tag"></a>tag
\r
857 A <a href="#ref_ref">ref</a> pointing to a <a href="#ref_tag">tag</a> or
\r
858 <a href="#ref_commit_object">commit object</a>. In contrast to a <a href="#ref_head">head</a>,
\r
859 a <a href="#ref_tag">tag</a> is not changed by a <a href="#ref_commit">commit</a>. Tags (not
\r
860 <a href="#ref_tag">tag</a> objects) are stored in <tt>$GIT_DIR/refs/tags/</tt>. A git
\r
861 <a href="#ref_tag">tag</a> has nothing to do with a Lisp <a href="#ref_tag">tag</a> (which is
\r
862 called <a href="#ref_object">object</a> type in git's context). A <a href="#ref_tag">tag</a>
\r
863 is most typically used to mark a particular point in the
\r
864 <a href="#ref_commit">commit</a> ancestry <a href="#ref_chain">chain</a>.
\r
868 <a id="ref_tag_object"></a>tag object
\r
872 An <a href="#ref_object">object</a> containing a <a href="#ref_ref">ref</a> pointing to
\r
873 another <a href="#ref_object">object</a>, which can contain a message just like a
\r
874 <a href="#ref_commit_object">commit object</a>. It can also contain a (PGP)
\r
875 signature, in which case it is called a "signed <a href="#ref_tag_object">tag object</a>".
\r
879 <a id="ref_topic_branch"></a>topic branch
\r
883 A regular git <a href="#ref_branch">branch</a> that is used by a developer to
\r
884 identify a conceptual line of development. Since branches are very easy
\r
885 and inexpensive, it is often desirable to have several small branches
\r
886 that each contain very well defined concepts or small incremental yet
\r
891 <a id="ref_tracking_branch"></a>tracking branch
\r
895 A regular git <a href="#ref_branch">branch</a> that is used to follow changes from
\r
896 another <a href="#ref_repository">repository</a>. A <a href="#ref_tracking_branch">tracking branch</a> should not contain direct modifications or have local commits
\r
897 made to it. A <a href="#ref_tracking_branch">tracking branch</a> can usually be
\r
898 identified as the right-hand-side <a href="#ref_ref">ref</a> in a Pull:
\r
899 <a href="#ref_refspec">refspec</a>.
\r
903 <a id="ref_tree"></a>tree
\r
907 Either a <a href="#ref_working_tree">working tree</a>, or a <a href="#ref_tree_object">tree object</a> together with the dependent blob and <a href="#ref_tree">tree</a> objects
\r
908 (i.e. a stored representation of a <a href="#ref_working_tree">working tree</a>).
\r
912 <a id="ref_tree_object"></a>tree object
\r
916 An <a href="#ref_object">object</a> containing a list of file names and modes along
\r
917 with refs to the associated blob and/or <a href="#ref_tree">tree</a> objects. A
\r
918 <a href="#ref_tree">tree</a> is equivalent to a <a href="#ref_directory">directory</a>.
\r
922 <a id="ref_tree-ish"></a>tree-ish
\r
926 A <a href="#ref_ref">ref</a> pointing to either a <a href="#ref_commit_object">commit object</a>, a <a href="#ref_tree_object">tree object</a>, or a <a href="#ref_tag_object">tag object</a> pointing to a <a href="#ref_tag">tag</a> or <a href="#ref_commit">commit</a> or
\r
927 <a href="#ref_tree_object">tree object</a>.
\r
931 <a id="ref_working_tree"></a>working tree
\r
935 The set of files and directories currently being worked on, i.e. you can
\r
936 work in your <a href="#ref_working_tree">working tree</a> without using git at all.
\r
943 <div class="sectionbody">
\r
944 <p>Written by Johannes Schindelin <Johannes.Schindelin@gmx.de> and
\r
945 the git-list <git@vger.kernel.org>.</p>
\r
948 <div class="sectionbody">
\r
949 <p>Part of the <a href="git.html">git</a> suite</p>
\r
952 <div id="footer-text">
\r
953 Last updated 07-Jun-2006 19:51:37 UTC
\r