Google Git
Sign in
chromium / external / gitster / git-htmldocs / ea82cff53ef3184e59a2e9e334f99284248e8b35 / . / gitglossary.html
blob: 4b68d61515615365c379dbebd8ee6a497268dc3d [file] [log] [blame]
Junio C Hamano1a4e8412005-12-27 08:17:23[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>
5<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
Junio C Hamanod32738e2008-07-09 19:53:42[diff] [blame]6<meta name="generator" content="AsciiDoc 8.2.5" />
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]7<style type="text/css">
8/* Debug borders */
9p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
10/*
11 border: 1px solid red;
12*/
13}
14
15body {
16 margin: 1em 5% 1em 5%;
17}
18
Junio C Hamanod32738e2008-07-09 19:53:42[diff] [blame]19a {
20 color: blue;
21 text-decoration: underline;
22}
23a:visited {
24 color: fuchsia;
25}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]26
27em {
28 font-style: italic;
29}
30
31strong {
32 font-weight: bold;
33}
34
35tt {
36 color: navy;
37}
38
39h1, h2, h3, h4, h5, h6 {
40 color: #527bbd;
41 font-family: sans-serif;
42 margin-top: 1.2em;
43 margin-bottom: 0.5em;
44 line-height: 1.3;
45}
46
Junio C Hamanod32738e2008-07-09 19:53:42[diff] [blame]47h1, h2, h3 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]48 border-bottom: 2px solid silver;
49}
50h2 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]51 padding-top: 0.5em;
52}
Junio C Hamanod32738e2008-07-09 19:53:42[diff] [blame]53h3 {
54 float: left;
55}
56h3 + * {
57 clear: left;
58}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]59
60div.sectionbody {
61 font-family: serif;
62 margin-left: 0;
63}
64
65hr {
66 border: 1px solid silver;
67}
68
69p {
70 margin-top: 0.5em;
71 margin-bottom: 0.5em;
72}
73
74pre {
75 padding: 0;
76 margin: 0;
77}
78
79span#author {
80 color: #527bbd;
81 font-family: sans-serif;
82 font-weight: bold;
Junio C Hamanod32738e2008-07-09 19:53:42[diff] [blame]83 font-size: 1.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]84}
85span#email {
86}
87span#revision {
88 font-family: sans-serif;
89}
90
91div#footer {
92 font-family: sans-serif;
93 font-size: small;
94 border-top: 2px solid silver;
95 padding-top: 0.5em;
96 margin-top: 4.0em;
97}
98div#footer-text {
99 float: left;
100 padding-bottom: 0.5em;
101}
102div#footer-badges {
103 float: right;
104 padding-bottom: 0.5em;
105}
106
107div#preamble,
108div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
109div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
110div.admonitionblock {
111 margin-right: 10%;
112 margin-top: 1.5em;
113 margin-bottom: 1.5em;
114}
115div.admonitionblock {
116 margin-top: 2.5em;
117 margin-bottom: 2.5em;
118}
119
120div.content { /* Block element content. */
121 padding: 0;
122}
123
124/* Block element titles. */
125div.title, caption.title {
126 font-family: sans-serif;
127 font-weight: bold;
128 text-align: left;
129 margin-top: 1.0em;
130 margin-bottom: 0.5em;
131}
132div.title + * {
133 margin-top: 0;
134}
135
136td div.title:first-child {
137 margin-top: 0.0em;
138}
139div.content div.title:first-child {
140 margin-top: 0.0em;
141}
142div.content + div.title {
143 margin-top: 0.0em;
144}
145
146div.sidebarblock > div.content {
147 background: #ffffee;
148 border: 1px solid silver;
149 padding: 0.5em;
150}
151
Junio C Hamanod32738e2008-07-09 19:53:42[diff] [blame]152div.listingblock {
153 margin-right: 0%;
154}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]155div.listingblock > div.content {
156 border: 1px solid silver;
157 background: #f4f4f4;
158 padding: 0.5em;
159}
160
161div.quoteblock > div.content {
162 padding-left: 2.0em;
163}
Junio C Hamanod32738e2008-07-09 19:53:42[diff] [blame]164
165div.attribution {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]166 text-align: right;
167}
Junio C Hamanod32738e2008-07-09 19:53:42[diff] [blame]168div.verseblock + div.attribution {
169 text-align: left;
170}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]171
172div.admonitionblock .icon {
173 vertical-align: top;
174 font-size: 1.1em;
175 font-weight: bold;
176 text-decoration: underline;
177 color: #527bbd;
178 padding-right: 0.5em;
179}
180div.admonitionblock td.content {
181 padding-left: 0.5em;
182 border-left: 2px solid silver;
183}
184
185div.exampleblock > div.content {
186 border-left: 2px solid silver;
187 padding: 0.5em;
188}
189
190div.verseblock div.content {
191 white-space: pre;
192}
193
194div.imageblock div.content { padding-left: 0; }
195div.imageblock img { border: 1px solid silver; }
196span.image img { border-style: none; }
197
198dl {
199 margin-top: 0.8em;
200 margin-bottom: 0.8em;
201}
202dt {
203 margin-top: 0.5em;
204 margin-bottom: 0;
205 font-style: italic;
206}
207dd > *:first-child {
208 margin-top: 0;
209}
210
211ul, ol {
212 list-style-position: outside;
213}
Junio C Hamanod32738e2008-07-09 19:53:42[diff] [blame]214div.olist2 ol {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]215 list-style-type: lower-alpha;
216}
217
218div.tableblock > table {
Junio C Hamanod32738e2008-07-09 19:53:42[diff] [blame]219 border: 3px solid #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]220}
221thead {
222 font-family: sans-serif;
223 font-weight: bold;
224}
225tfoot {
226 font-weight: bold;
227}
228
229div.hlist {
230 margin-top: 0.8em;
231 margin-bottom: 0.8em;
232}
Junio C Hamanod32738e2008-07-09 19:53:42[diff] [blame]233div.hlist td {
234 padding-bottom: 5px;
235}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]236td.hlist1 {
237 vertical-align: top;
238 font-style: italic;
239 padding-right: 0.8em;
240}
241td.hlist2 {
242 vertical-align: top;
243}
244
245@media print {
246 div#footer-badges { display: none; }
247}
Junio C Hamanod32738e2008-07-09 19:53:42[diff] [blame]248
249div#toctitle {
250 color: #527bbd;
251 font-family: sans-serif;
252 font-size: 1.1em;
253 font-weight: bold;
254 margin-top: 1.0em;
255 margin-bottom: 0.1em;
256}
257
258div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
259 margin-top: 0;
260 margin-bottom: 0;
261}
262div.toclevel2 {
263 margin-left: 2em;
264 font-size: 0.9em;
265}
266div.toclevel3 {
267 margin-left: 4em;
268 font-size: 0.9em;
269}
270div.toclevel4 {
271 margin-left: 6em;
272 font-size: 0.9em;
273}
274include1::./stylesheets/xhtml11-manpage.css[]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]275/* Workarounds for IE6's broken and incomplete CSS2. */
276
277div.sidebar-content {
278 background: #ffffee;
279 border: 1px solid silver;
280 padding: 0.5em;
281}
282div.sidebar-title, div.image-title {
283 font-family: sans-serif;
284 font-weight: bold;
285 margin-top: 0.0em;
286 margin-bottom: 0.5em;
287}
288
289div.listingblock div.content {
290 border: 1px solid silver;
291 background: #f4f4f4;
292 padding: 0.5em;
293}
294
295div.quoteblock-content {
296 padding-left: 2.0em;
297}
298
299div.exampleblock-content {
300 border-left: 2px solid silver;
301 padding-left: 0.5em;
302}
Junio C Hamanod32738e2008-07-09 19:53:42[diff] [blame]303
304/* IE6 sets dynamically generated links as visited. */
305div#toc a:visited { color: blue; }
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]306</style>
Junio C Hamano9e1793f2008-06-02 07:31:16[diff] [blame]307<title>gitglossary(7)</title>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]308</head>
309<body>
310<div id="header">
Junio C Hamano9e1793f2008-06-02 07:31:16[diff] [blame]311<h1>
312gitglossary(7) Manual Page
313</h1>
314<h2>NAME</h2>
315<div class="sectionbody">
316<p>gitglossary -
317 A GIT Glossary
318</p>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]319</div>
Junio C Hamano9e1793f2008-06-02 07:31:16[diff] [blame]320</div>
321<h2>SYNOPSIS</h2>
322<div class="sectionbody">
Junio C Hamanod32738e2008-07-09 19:53:42[diff] [blame]323<div class="para"><p>*</p></div>
Junio C Hamano9e1793f2008-06-02 07:31:16[diff] [blame]324</div>
Junio C Hamanod32738e2008-07-09 19:53:42[diff] [blame]325<h2 id="_description">DESCRIPTION</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]326<div class="sectionbody">
Junio C Hamanod32738e2008-07-09 19:53:42[diff] [blame]327<div class="vlist"><dl>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]328<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]329<a id="def_alternate_object_database"></a>alternate object database
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]330</dt>
331<dd>
332<p>
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]333 Via the alternates mechanism, a <a href="#def_repository">repository</a>
334 can inherit part of its <a href="#def_object_database">object database</a>
335 from another object database, which is called "alternate".
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]336</p>
337</dd>
338<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]339<a id="def_bare_repository"></a>bare repository
Junio C Hamano88a3a072006-05-04 08:01:43[diff] [blame]340</dt>
341<dd>
342<p>
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]343 A bare repository is normally an appropriately
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]344 named <a href="#def_directory">directory</a> with a <tt>.git</tt> suffix that does not
Junio C Hamano88a3a072006-05-04 08:01:43[diff] [blame]345 have a locally checked-out copy of any of the files under
Junio C Hamano36460982007-05-27 04:29:12[diff] [blame]346 revision control. That is, all of the <tt>git</tt>
Junio C Hamano88a3a072006-05-04 08:01:43[diff] [blame]347 administrative and control files that would normally be present in the
Junio C Hamanoc51fede2007-03-12 07:29:20[diff] [blame]348 hidden <tt>.git</tt> sub-directory are directly present in the
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]349 <tt>repository.git</tt> directory instead,
Junio C Hamanoc51fede2007-03-12 07:29:20[diff] [blame]350 and no other files are present and checked out. Usually publishers of
351 public repositories make bare repositories available.
Junio C Hamano88a3a072006-05-04 08:01:43[diff] [blame]352</p>
353</dd>
354<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]355<a id="def_blob_object"></a>blob object
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]356</dt>
357<dd>
358<p>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]359 Untyped <a href="#def_object">object</a>, e.g. the contents of a file.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]360</p>
361</dd>
362<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]363<a id="def_branch"></a>branch
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]364</dt>
365<dd>
366<p>
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]367 A "branch" is an active line of development. The most recent
368 <a href="#def_commit">commit</a> on a branch is referred to as the tip of
369 that branch. The tip of the branch is referenced by a branch
370 <a href="#def_head">head</a>, which moves forward as additional development
371 is done on the branch. A single git
372 <a href="#def_repository">repository</a> can track an arbitrary number of
373 branches, but your <a href="#def_working_tree">working tree</a> is
374 associated with just one of them (the "current" or "checked out"
375 branch), and <a href="#def_HEAD">HEAD</a> points to that branch.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]376</p>
377</dd>
378<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]379<a id="def_cache"></a>cache
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]380</dt>
381<dd>
382<p>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]383 Obsolete for: <a href="#def_index">index</a>.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]384</p>
385</dd>
386<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]387<a id="def_chain"></a>chain
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]388</dt>
389<dd>
390<p>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]391 A list of objects, where each <a href="#def_object">object</a> in the list contains
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]392 a reference to its successor (for example, the successor of a
Junio C Hamano36460982007-05-27 04:29:12[diff] [blame]393 <a href="#def_commit">commit</a> could be one of its <a href="#def_parent">parents</a>).
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]394</p>
395</dd>
396<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]397<a id="def_changeset"></a>changeset
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]398</dt>
399<dd>
400<p>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]401 BitKeeper/cvsps speak for "<a href="#def_commit">commit</a>". Since git does not
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]402 store changes, but states, it really does not make sense to use the term
403 "changesets" with git.
404</p>
405</dd>
406<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]407<a id="def_checkout"></a>checkout
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]408</dt>
409<dd>
410<p>
Junio C Hamanoa14a4032008-03-25 09:11:02[diff] [blame]411 The action of updating all or part of the
412 <a href="#def_working_tree">working tree</a> with a <a href="#def_tree_object">tree object</a>
413 or <a href="#def_blob_object">blob</a> from the
414 <a href="#def_object_database">object database</a>, and updating the
415 <a href="#def_index">index</a> and <a href="#def_HEAD">HEAD</a> if the whole working tree has
416 been pointed at a new <a href="#def_branch">branch</a>.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]417</p>
418</dd>
419<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]420<a id="def_cherry-picking"></a>cherry-picking
Junio C Hamano88a3a072006-05-04 08:01:43[diff] [blame]421</dt>
422<dd>
423<p>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]424 In <a href="#def_SCM">SCM</a> jargon, "cherry pick" means to choose a subset of
Junio C Hamano88a3a072006-05-04 08:01:43[diff] [blame]425 changes out of a series of changes (typically commits) and record them
Junio C Hamano764a6672007-10-23 01:23:31[diff] [blame]426 as a new series of changes on top of a different codebase. In GIT, this is
427 performed by the "git cherry-pick" command to extract the change introduced
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]428 by an existing <a href="#def_commit">commit</a> and to record it based on the tip
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]429 of the current <a href="#def_branch">branch</a> as a new commit.
Junio C Hamano88a3a072006-05-04 08:01:43[diff] [blame]430</p>
431</dd>
432<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]433<a id="def_clean"></a>clean
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]434</dt>
435<dd>
436<p>
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]437 A <a href="#def_working_tree">working tree</a> is clean, if it
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]438 corresponds to the <a href="#def_revision">revision</a> referenced by the current
439 <a href="#def_head">head</a>. Also see "<a href="#def_dirty">dirty</a>".
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]440</p>
441</dd>
442<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]443<a id="def_commit"></a>commit
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]444</dt>
445<dd>
446<p>
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]447 As a noun: A single point in the
448 git history; the entire history of a project is represented as a
449 set of interrelated commits. The word "commit" is often
450 used by git in the same places other revision control systems
451 use the words "revision" or "version". Also used as a short
452 hand for <a href="#def_commit_object">commit object</a>.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]453</p>
Junio C Hamanod32738e2008-07-09 19:53:42[diff] [blame]454<div class="para"><p>As a verb: The action of storing a new snapshot of the project's
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]455state in the git history, by creating a new commit representing the current
456state of the <a href="#def_index">index</a> and advancing <a href="#def_HEAD">HEAD</a>
Junio C Hamanod32738e2008-07-09 19:53:42[diff] [blame]457to point at the new commit.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]458</dd>
459<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]460<a id="def_commit_object"></a>commit object
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]461</dt>
462<dd>
463<p>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]464 An <a href="#def_object">object</a> which contains the information about a
Junio C Hamano36460982007-05-27 04:29:12[diff] [blame]465 particular <a href="#def_revision">revision</a>, such as <a href="#def_parent">parents</a>, committer,
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]466 author, date and the <a href="#def_tree_object">tree object</a> which corresponds
467 to the top <a href="#def_directory">directory</a> of the stored
Junio C Hamano36460982007-05-27 04:29:12[diff] [blame]468 revision.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]469</p>
470</dd>
471<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]472<a id="def_core_git"></a>core git
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]473</dt>
474<dd>
475<p>
476 Fundamental data structures and utilities of git. Exposes only limited
477 source code management tools.
478</p>
479</dd>
480<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]481<a id="def_DAG"></a>DAG
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]482</dt>
483<dd>
484<p>
Junio C Hamano9e1793f2008-06-02 07:31:16[diff] [blame]485 Directed acyclic graph. The <a href="#def_commit_object">commit objects</a> form a
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]486 directed acyclic graph, because they have parents (directed), and the
Junio C Hamano9e1793f2008-06-02 07:31:16[diff] [blame]487 graph of commit objects is acyclic (there is no <a href="#def_chain">chain</a>
488 which begins and ends with the same <a href="#def_object">object</a>).
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]489</p>
490</dd>
491<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]492<a id="def_dangling_object"></a>dangling object
Junio C Hamanoaa83a7d2007-03-05 02:37:29[diff] [blame]493</dt>
494<dd>
495<p>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]496 An <a href="#def_unreachable_object">unreachable object</a> which is not
497 <a href="#def_reachable">reachable</a> even from other unreachable objects; a
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]498 dangling object has no references to it from any
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]499 reference or <a href="#def_object">object</a> in the <a href="#def_repository">repository</a>.
Junio C Hamanoaa83a7d2007-03-05 02:37:29[diff] [blame]500</p>
501</dd>
502<dt>
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]503<a id="def_detached_HEAD"></a>detached HEAD
504</dt>
505<dd>
506<p>
507 Normally the <a href="#def_HEAD">HEAD</a> stores the name of a
Junio C Hamano36460982007-05-27 04:29:12[diff] [blame]508 <a href="#def_branch">branch</a>. However, git also allows you to <a href="#def_checkout">check out</a>
509 an arbitrary <a href="#def_commit">commit</a> that isn't necessarily the tip of any
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]510 particular branch. In this case HEAD is said to be "detached".
511</p>
512</dd>
513<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]514<a id="def_dircache"></a>dircache
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]515</dt>
516<dd>
517<p>
Junio C Hamano36460982007-05-27 04:29:12[diff] [blame]518 You are <strong>waaaaay</strong> behind. See <a href="#def_index">index</a>.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]519</p>
520</dd>
521<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]522<a id="def_directory"></a>directory
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]523</dt>
524<dd>
525<p>
526 The list you get with "ls" :-)
527</p>
528</dd>
529<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]530<a id="def_dirty"></a>dirty
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]531</dt>
532<dd>
533<p>
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]534 A <a href="#def_working_tree">working tree</a> is said to be "dirty" if
Junio C Hamano36460982007-05-27 04:29:12[diff] [blame]535 it contains modifications which have not been <a href="#def_commit">committed</a> to the current
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]536 <a href="#def_branch">branch</a>.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]537</p>
538</dd>
539<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]540<a id="def_ent"></a>ent
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]541</dt>
542<dd>
543<p>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]544 Favorite synonym to "<a href="#def_tree-ish">tree-ish</a>" by some total geeks. See
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]545 <tt>http://en.wikipedia.org/wiki/Ent_(Middle-earth)</tt> for an in-depth
Junio C Hamano51c2ab02006-07-09 20:38:54[diff] [blame]546 explanation. Avoid this term, not to confuse people.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]547</p>
548</dd>
549<dt>
Junio C Hamano36460982007-05-27 04:29:12[diff] [blame]550<a id="def_evil_merge"></a>evil merge
551</dt>
552<dd>
553<p>
554 An evil merge is a <a href="#def_merge">merge</a> that introduces changes that
555 do not appear in any <a href="#def_parent">parent</a>.
556</p>
557</dd>
558<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]559<a id="def_fast_forward"></a>fast forward
Junio C Hamano88a3a072006-05-04 08:01:43[diff] [blame]560</dt>
561<dd>
562<p>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]563 A fast-forward is a special type of <a href="#def_merge">merge</a> where you have a
564 <a href="#def_revision">revision</a> and you are "merging" another
565 <a href="#def_branch">branch</a>'s changes that happen to be a descendant of what
566 you have. In such these cases, you do not make a new <a href="#def_merge">merge</a>
567 <a href="#def_commit">commit</a> but instead just update to his
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]568 revision. This will happen frequently on a
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]569 <a href="#def_tracking_branch">tracking branch</a> of a remote
570 <a href="#def_repository">repository</a>.
Junio C Hamano88a3a072006-05-04 08:01:43[diff] [blame]571</p>
572</dd>
573<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]574<a id="def_fetch"></a>fetch
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]575</dt>
576<dd>
577<p>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]578 Fetching a <a href="#def_branch">branch</a> means to get the
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]579 branch's <a href="#def_head_ref">head ref</a> from a remote
580 <a href="#def_repository">repository</a>, to find out which objects are
581 missing from the local <a href="#def_object_database">object database</a>,
582 and to get them, too. See also <a href="git-fetch.html">git-fetch(1)</a>.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]583</p>
584</dd>
585<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]586<a id="def_file_system"></a>file system
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]587</dt>
588<dd>
589<p>
590 Linus Torvalds originally designed git to be a user space file system,
591 i.e. the infrastructure to hold files and directories. That ensured the
592 efficiency and speed of git.
593</p>
594</dd>
595<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]596<a id="def_git_archive"></a>git archive
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]597</dt>
598<dd>
599<p>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]600 Synonym for <a href="#def_repository">repository</a> (for arch people).
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]601</p>
602</dd>
603<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]604<a id="def_grafts"></a>grafts
Junio C Hamano33db4372006-06-07 19:51:45[diff] [blame]605</dt>
606<dd>
607<p>
608 Grafts enables two otherwise different lines of development to be joined
609 together by recording fake ancestry information for commits. This way
Junio C Hamano36460982007-05-27 04:29:12[diff] [blame]610 you can make git pretend the set of <a href="#def_parent">parents</a> a <a href="#def_commit">commit</a> has
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]611 is different from what was recorded when the commit was
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]612 created. Configured via the <tt>.git/info/grafts</tt> file.
Junio C Hamano33db4372006-06-07 19:51:45[diff] [blame]613</p>
614</dd>
615<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]616<a id="def_hash"></a>hash
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]617</dt>
618<dd>
619<p>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]620 In git's context, synonym to <a href="#def_object_name">object name</a>.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]621</p>
622</dd>
623<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]624<a id="def_head"></a>head
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]625</dt>
626<dd>
627<p>
Junio C Hamano36460982007-05-27 04:29:12[diff] [blame]628 A <a href="#def_ref">named reference</a> to the <a href="#def_commit">commit</a> at the tip of a
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]629 <a href="#def_branch">branch</a>. Heads are stored in
630 <tt>$GIT_DIR/refs/heads/</tt>, except when using packed refs. (See
631 <a href="git-pack-refs.html">git-pack-refs(1)</a>.)
632</p>
633</dd>
634<dt>
635<a id="def_HEAD"></a>HEAD
636</dt>
637<dd>
638<p>
Junio C Hamano36460982007-05-27 04:29:12[diff] [blame]639 The current <a href="#def_branch">branch</a>. In more detail: Your <a href="#def_working_tree">working tree</a> is normally derived from the state of the tree
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]640 referred to by HEAD. HEAD is a reference to one of the
641 <a href="#def_head">heads</a> in your repository, except when using a
642 <a href="#def_detached_HEAD">detached HEAD</a>, in which case it may
643 reference an arbitrary commit.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]644</p>
645</dd>
646<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]647<a id="def_head_ref"></a>head ref
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]648</dt>
649<dd>
650<p>
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]651 A synonym for <a href="#def_head">head</a>.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]652</p>
653</dd>
654<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]655<a id="def_hook"></a>hook
Junio C Hamano88a3a072006-05-04 08:01:43[diff] [blame]656</dt>
657<dd>
658<p>
659 During the normal execution of several git commands, call-outs are made
660 to optional scripts that allow a developer to add functionality or
661 checking. Typically, the hooks allow for a command to be pre-verified
662 and potentially aborted, and allow for a post-notification after the
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]663 operation is done. The hook scripts are found in the
Junio C Hamano36460982007-05-27 04:29:12[diff] [blame]664 <tt>$GIT_DIR/hooks/</tt> directory, and are enabled by simply
Junio C Hamano116db352008-12-17 19:48:40[diff] [blame]665 removing the <tt>.sample</tt> suffix from the filename. In earlier versions
666 of git you had to make them executable.
Junio C Hamano88a3a072006-05-04 08:01:43[diff] [blame]667</p>
668</dd>
669<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]670<a id="def_index"></a>index
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]671</dt>
672<dd>
673<p>
674 A collection of files with stat information, whose contents are stored
Junio C Hamano36460982007-05-27 04:29:12[diff] [blame]675 as objects. The index is a stored version of your
676 <a href="#def_working_tree">working tree</a>. Truth be told, it can also contain a second, and even
677 a third version of a working tree, which are used
678 when <a href="#def_merge">merging</a>.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]679</p>
680</dd>
681<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]682<a id="def_index_entry"></a>index entry
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]683</dt>
684<dd>
685<p>
686 The information regarding a particular file, stored in the
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]687 <a href="#def_index">index</a>. An index entry can be unmerged, if a
688 <a href="#def_merge">merge</a> was started, but not yet finished (i.e. if
689 the index contains multiple versions of that file).
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]690</p>
691</dd>
692<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]693<a id="def_master"></a>master
Junio C Hamanof3e80c02006-01-11 00:54:55[diff] [blame]694</dt>
695<dd>
696<p>
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]697 The default development <a href="#def_branch">branch</a>. Whenever you
698 create a git <a href="#def_repository">repository</a>, a branch named
699 "master" is created, and becomes the active branch. In most
700 cases, this contains the local development, though that is
701 purely by convention and is not required.
Junio C Hamanof3e80c02006-01-11 00:54:55[diff] [blame]702</p>
703</dd>
704<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]705<a id="def_merge"></a>merge
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]706</dt>
707<dd>
708<p>
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]709 As a verb: To bring the contents of another
710 <a href="#def_branch">branch</a> (possibly from an external
711 <a href="#def_repository">repository</a>) into the current branch. In the
712 case where the merged-in branch is from a different repository,
713 this is done by first <a href="#def_fetch">fetching</a> the remote branch
714 and then merging the result into the current branch. This
715 combination of fetch and merge operations is called a
716 <a href="#def_pull">pull</a>. Merging is performed by an automatic process
717 that identifies changes made since the branches diverged, and
718 then applies all those changes together. In cases where changes
719 conflict, manual intervention may be required to complete the
720 merge.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]721</p>
Junio C Hamanod32738e2008-07-09 19:53:42[diff] [blame]722<div class="para"><p>As a noun: unless it is a <a href="#def_fast_forward">fast forward</a>, a
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]723successful merge results in the creation of a new <a href="#def_commit">commit</a>
724representing the result of the merge, and having as
725<a href="#def_parent">parents</a> the tips of the merged <a href="#def_branch">branches</a>.
726This commit is referred to as a "merge commit", or sometimes just a
Junio C Hamanod32738e2008-07-09 19:53:42[diff] [blame]727"merge".</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]728</dd>
729<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]730<a id="def_object"></a>object
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]731</dt>
732<dd>
733<p>
734 The unit of storage in git. It is uniquely identified by the
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]735 <a href="#def_SHA1">SHA1</a> of its contents. Consequently, an
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]736 object can not be changed.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]737</p>
738</dd>
739<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]740<a id="def_object_database"></a>object database
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]741</dt>
742<dd>
743<p>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]744 Stores a set of "objects", and an individual <a href="#def_object">object</a> is
745 identified by its <a href="#def_object_name">object name</a>. The objects usually
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]746 live in <tt>$GIT_DIR/objects/</tt>.
747</p>
748</dd>
749<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]750<a id="def_object_identifier"></a>object identifier
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]751</dt>
752<dd>
753<p>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]754 Synonym for <a href="#def_object_name">object name</a>.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]755</p>
756</dd>
757<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]758<a id="def_object_name"></a>object name
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]759</dt>
760<dd>
761<p>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]762 The unique identifier of an <a href="#def_object">object</a>. The <a href="#def_hash">hash</a>
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]763 of the object's contents using the Secure Hash Algorithm
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]764 1 and usually represented by the 40 character hexadecimal encoding of
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]765 the <a href="#def_hash">hash</a> of the object.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]766</p>
767</dd>
768<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]769<a id="def_object_type"></a>object type
Junio C Hamano21c0b422006-10-12 19:10:36[diff] [blame]770</dt>
771<dd>
772<p>
Junio C Hamano9e1793f2008-06-02 07:31:16[diff] [blame]773 One of the identifiers "<a href="#def_commit_object">commit</a>",
774 "<a href="#def_tree_object">tree</a>", "<a href="#def_tag_object">tag</a>" or
775 "<a href="#def_blob_object">blob</a>" describing the type of an
776 <a href="#def_object">object</a>.
Junio C Hamano21c0b422006-10-12 19:10:36[diff] [blame]777</p>
778</dd>
779<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]780<a id="def_octopus"></a>octopus
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]781</dt>
782<dd>
783<p>
Junio C Hamano36460982007-05-27 04:29:12[diff] [blame]784 To <a href="#def_merge">merge</a> more than two <a href="#def_branch">branches</a>. Also denotes an
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]785 intelligent predator.
786</p>
787</dd>
788<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]789<a id="def_origin"></a>origin
Junio C Hamanof3e80c02006-01-11 00:54:55[diff] [blame]790</dt>
791<dd>
792<p>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]793 The default upstream <a href="#def_repository">repository</a>. Most projects have
Junio C Hamanod3361ad2007-01-01 03:20:24[diff] [blame]794 at least one upstream project which they track. By default
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]795 <em>origin</em> is used for that purpose. New upstream updates
Junio C Hamano36460982007-05-27 04:29:12[diff] [blame]796 will be fetched into remote <a href="#def_tracking_branch">tracking branches</a> named
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]797 origin/name-of-upstream-branch, which you can see using
Junio C Hamanoea82cff2009-03-18 01:54:48[diff] [blame^]798 <tt>git branch -r</tt>.
Junio C Hamanof3e80c02006-01-11 00:54:55[diff] [blame]799</p>
800</dd>
801<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]802<a id="def_pack"></a>pack
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]803</dt>
804<dd>
805<p>
806 A set of objects which have been compressed into one file (to save space
807 or to transmit them efficiently).
808</p>
809</dd>
810<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]811<a id="def_pack_index"></a>pack index
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]812</dt>
813<dd>
814<p>
815 The list of identifiers, and other information, of the objects in a
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]816 <a href="#def_pack">pack</a>, to assist in efficiently accessing the contents of a
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]817 pack.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]818</p>
819</dd>
820<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]821<a id="def_parent"></a>parent
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]822</dt>
823<dd>
824<p>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]825 A <a href="#def_commit_object">commit object</a> contains a (possibly empty) list
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]826 of the logical predecessor(s) in the line of development, i.e. its
827 parents.
828</p>
829</dd>
830<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]831<a id="def_pickaxe"></a>pickaxe
Junio C Hamano88a3a072006-05-04 08:01:43[diff] [blame]832</dt>
833<dd>
834<p>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]835 The term <a href="#def_pickaxe">pickaxe</a> refers to an option to the diffcore
Junio C Hamano88a3a072006-05-04 08:01:43[diff] [blame]836 routines that help select changes that add or delete a given text
Junio C Hamano9e1793f2008-06-02 07:31:16[diff] [blame]837 string. With the <tt>--pickaxe-all</tt> option, it can be used to view the full
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]838 <a href="#def_changeset">changeset</a> that introduced or removed, say, a
Junio C Hamanoc51fede2007-03-12 07:29:20[diff] [blame]839 particular line of text. See <a href="git-diff.html">git-diff(1)</a>.
Junio C Hamano88a3a072006-05-04 08:01:43[diff] [blame]840</p>
841</dd>
842<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]843<a id="def_plumbing"></a>plumbing
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]844</dt>
845<dd>
846<p>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]847 Cute name for <a href="#def_core_git">core git</a>.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]848</p>
849</dd>
850<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]851<a id="def_porcelain"></a>porcelain
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]852</dt>
853<dd>
854<p>
855 Cute name for programs and program suites depending on
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]856 <a href="#def_core_git">core git</a>, presenting a high level access to
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]857 core git. Porcelains expose more of a <a href="#def_SCM">SCM</a>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]858 interface than the <a href="#def_plumbing">plumbing</a>.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]859</p>
860</dd>
861<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]862<a id="def_pull"></a>pull
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]863</dt>
864<dd>
865<p>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]866 Pulling a <a href="#def_branch">branch</a> means to <a href="#def_fetch">fetch</a> it and
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]867 <a href="#def_merge">merge</a> it. See also <a href="git-pull.html">git-pull(1)</a>.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]868</p>
869</dd>
870<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]871<a id="def_push"></a>push
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]872</dt>
873<dd>
874<p>
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]875 Pushing a <a href="#def_branch">branch</a> means to get the branch's
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]876 <a href="#def_head_ref">head ref</a> from a remote <a href="#def_repository">repository</a>,
Junio C Hamano764a6672007-10-23 01:23:31[diff] [blame]877 find out if it is a direct ancestor to the branch's local
878 head ref, and in that case, putting all
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]879 objects, which are <a href="#def_reachable">reachable</a> from the local
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]880 head ref, and which are missing from the remote
881 repository, into the remote
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]882 <a href="#def_object_database">object database</a>, and updating the remote
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]883 head ref. If the remote <a href="#def_head">head</a> is not an
884 ancestor to the local head, the push fails.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]885</p>
886</dd>
887<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]888<a id="def_reachable"></a>reachable
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]889</dt>
890<dd>
891<p>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]892 All of the ancestors of a given <a href="#def_commit">commit</a> are said to be
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]893 "reachable" from that commit. More
894 generally, one <a href="#def_object">object</a> is reachable from
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]895 another if we can reach the one from the other by a <a href="#def_chain">chain</a>
896 that follows <a href="#def_tag">tags</a> to whatever they tag,
897 <a href="#def_commit_object">commits</a> to their parents or trees, and
898 <a href="#def_tree_object">trees</a> to the trees or <a href="#def_blob_object">blobs</a>
899 that they contain.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]900</p>
901</dd>
902<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]903<a id="def_rebase"></a>rebase
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]904</dt>
905<dd>
906<p>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]907 To reapply a series of changes from a <a href="#def_branch">branch</a> to a
908 different base, and reset the <a href="#def_head">head</a> of that branch
909 to the result.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]910</p>
911</dd>
912<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]913<a id="def_ref"></a>ref
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]914</dt>
915<dd>
916<p>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]917 A 40-byte hex representation of a <a href="#def_SHA1">SHA1</a> or a name that
918 denotes a particular <a href="#def_object">object</a>. These may be stored in
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]919 <tt>$GIT_DIR/refs/</tt>.
920</p>
921</dd>
922<dt>
Junio C Hamanobb0f4042007-07-04 06:41:40[diff] [blame]923<a id="def_reflog"></a>reflog
924</dt>
925<dd>
926<p>
927 A reflog shows the local "history" of a ref. In other words,
Junio C Hamano4604fe52008-09-19 06:37:10[diff] [blame]928 it can tell you what the 3rd last revision in _this_ repository
929 was, and what was the current state in _this_ repository,
Junio C Hamanobb0f4042007-07-04 06:41:40[diff] [blame]930 yesterday 9:14pm. See <a href="git-reflog.html">git-reflog(1)</a> for details.
931</p>
932</dd>
933<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]934<a id="def_refspec"></a>refspec
Junio C Hamano88a3a072006-05-04 08:01:43[diff] [blame]935</dt>
936<dd>
937<p>
Junio C Hamano36460982007-05-27 04:29:12[diff] [blame]938 A "refspec" is used by <a href="#def_fetch">fetch</a> and
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]939 <a href="#def_push">push</a> to describe the mapping between remote
940 <a href="#def_ref">ref</a> and local ref. They are combined with a colon in
941 the format &lt;src&gt;:&lt;dst&gt;, preceded by an optional plus sign, +.
942 For example: <tt>git fetch $URL
943 refs/heads/master:refs/heads/origin</tt> means "grab the master
944 <a href="#def_branch">branch</a> <a href="#def_head">head</a> from the $URL and store
945 it as my origin branch head". And <tt>git push
946 $URL refs/heads/master:refs/heads/to-upstream</tt> means "publish my
947 master branch head as to-upstream branch at $URL". See also
Junio C Hamano764a6672007-10-23 01:23:31[diff] [blame]948 <a href="git-push.html">git-push(1)</a>.
Junio C Hamano88a3a072006-05-04 08:01:43[diff] [blame]949</p>
950</dd>
951<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]952<a id="def_repository"></a>repository
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]953</dt>
954<dd>
955<p>
Junio C Hamano36460982007-05-27 04:29:12[diff] [blame]956 A collection of <a href="#def_ref">refs</a> together with an
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]957 <a href="#def_object_database">object database</a> containing all objects
958 which are <a href="#def_reachable">reachable</a> from the refs, possibly
Junio C Hamano36460982007-05-27 04:29:12[diff] [blame]959 accompanied by meta data from one or more <a href="#def_porcelain">porcelains</a>. A
960 repository can share an object database with other repositories
961 via <a href="#def_alternate_object_database">alternates mechanism</a>.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]962</p>
963</dd>
964<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]965<a id="def_resolve"></a>resolve
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]966</dt>
967<dd>
968<p>
969 The action of fixing up manually what a failed automatic
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]970 <a href="#def_merge">merge</a> left behind.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]971</p>
972</dd>
973<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]974<a id="def_revision"></a>revision
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]975</dt>
976<dd>
977<p>
978 A particular state of files and directories which was stored in the
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]979 <a href="#def_object_database">object database</a>. It is referenced by a
980 <a href="#def_commit_object">commit object</a>.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]981</p>
982</dd>
983<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]984<a id="def_rewind"></a>rewind
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]985</dt>
986<dd>
987<p>
988 To throw away part of the development, i.e. to assign the
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]989 <a href="#def_head">head</a> to an earlier <a href="#def_revision">revision</a>.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]990</p>
991</dd>
992<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]993<a id="def_SCM"></a>SCM
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]994</dt>
995<dd>
996<p>
997 Source code management (tool).
998</p>
999</dd>
1000<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]1001<a id="def_SHA1"></a>SHA1
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1002</dt>
1003<dd>
1004<p>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]1005 Synonym for <a href="#def_object_name">object name</a>.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1006</p>
1007</dd>
1008<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]1009<a id="def_shallow_repository"></a>shallow repository
Junio C Hamano4f9a6052007-01-17 20:25:16[diff] [blame]1010</dt>
1011<dd>
1012<p>
Junio C Hamano36460982007-05-27 04:29:12[diff] [blame]1013 A shallow <a href="#def_repository">repository</a> has an incomplete
1014 history some of whose <a href="#def_commit">commits</a> have <a href="#def_parent">parents</a> cauterized away (in other
Junio C Hamano4f9a6052007-01-17 20:25:16[diff] [blame]1015 words, git is told to pretend that these commits do not have the
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]1016 parents, even though they are recorded in the <a href="#def_commit_object">commit object</a>). This is sometimes useful when you are interested only in the
Junio C Hamano4f9a6052007-01-17 20:25:16[diff] [blame]1017 recent history of a project even though the real history recorded in the
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]1018 upstream is much larger. A shallow repository
Junio C Hamano9e1793f2008-06-02 07:31:16[diff] [blame]1019 is created by giving the <tt>--depth</tt> option to <a href="git-clone.html">git-clone(1)</a>, and
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]1020 its history can be later deepened with <a href="git-fetch.html">git-fetch(1)</a>.
Junio C Hamano4f9a6052007-01-17 20:25:16[diff] [blame]1021</p>
1022</dd>
1023<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]1024<a id="def_symref"></a>symref
Junio C Hamano3a971022006-11-18 22:17:58[diff] [blame]1025</dt>
1026<dd>
1027<p>
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]1028 Symbolic reference: instead of containing the <a href="#def_SHA1">SHA1</a>
1029 id itself, it is of the format <em>ref: refs/some/thing</em> and when
1030 referenced, it recursively dereferences to this reference.
1031 <em><a href="#def_HEAD">HEAD</a></em> is a prime example of a symref. Symbolic
1032 references are manipulated with the <a href="git-symbolic-ref.html">git-symbolic-ref(1)</a>
1033 command.
Junio C Hamano3a971022006-11-18 22:17:58[diff] [blame]1034</p>
1035</dd>
1036<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]1037<a id="def_tag"></a>tag
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1038</dt>
1039<dd>
1040<p>
Junio C Hamano36460982007-05-27 04:29:12[diff] [blame]1041 A <a href="#def_ref">ref</a> pointing to a <a href="#def_tag_object">tag</a> or
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]1042 <a href="#def_commit_object">commit object</a>. In contrast to a <a href="#def_head">head</a>,
1043 a tag is not changed by a <a href="#def_commit">commit</a>. Tags (not
1044 <a href="#def_tag_object">tag objects</a>) are stored in <tt>$GIT_DIR/refs/tags/</tt>. A
1045 git tag has nothing to do with a Lisp tag (which would be
1046 called an <a href="#def_object_type">object type</a> in git's context). A
1047 tag is most typically used to mark a particular point in the
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]1048 commit ancestry <a href="#def_chain">chain</a>.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1049</p>
1050</dd>
1051<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]1052<a id="def_tag_object"></a>tag object
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1053</dt>
1054<dd>
1055<p>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]1056 An <a href="#def_object">object</a> containing a <a href="#def_ref">ref</a> pointing to
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]1057 another object, which can contain a message just like a
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]1058 <a href="#def_commit_object">commit object</a>. It can also contain a (PGP)
Junio C Hamano36460982007-05-27 04:29:12[diff] [blame]1059 signature, in which case it is called a "signed tag object".
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1060</p>
1061</dd>
1062<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]1063<a id="def_topic_branch"></a>topic branch
Junio C Hamano88a3a072006-05-04 08:01:43[diff] [blame]1064</dt>
1065<dd>
1066<p>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]1067 A regular git <a href="#def_branch">branch</a> that is used by a developer to
Junio C Hamano88a3a072006-05-04 08:01:43[diff] [blame]1068 identify a conceptual line of development. Since branches are very easy
1069 and inexpensive, it is often desirable to have several small branches
1070 that each contain very well defined concepts or small incremental yet
1071 related changes.
1072</p>
1073</dd>
1074<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]1075<a id="def_tracking_branch"></a>tracking branch
Junio C Hamano88a3a072006-05-04 08:01:43[diff] [blame]1076</dt>
1077<dd>
1078<p>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]1079 A regular git <a href="#def_branch">branch</a> that is used to follow changes from
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]1080 another <a href="#def_repository">repository</a>. A tracking
1081 branch should not contain direct modifications or have local commits
1082 made to it. A tracking branch can usually be
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]1083 identified as the right-hand-side <a href="#def_ref">ref</a> in a Pull:
1084 <a href="#def_refspec">refspec</a>.
Junio C Hamano88a3a072006-05-04 08:01:43[diff] [blame]1085</p>
1086</dd>
1087<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]1088<a id="def_tree"></a>tree
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1089</dt>
1090<dd>
1091<p>
Junio C Hamano36460982007-05-27 04:29:12[diff] [blame]1092 Either a <a href="#def_working_tree">working tree</a>, or a <a href="#def_tree_object">tree object</a> together with the dependent <a href="#def_blob_object">blob</a> and tree objects
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]1093 (i.e. a stored representation of a working tree).
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1094</p>
1095</dd>
1096<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]1097<a id="def_tree_object"></a>tree object
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1098</dt>
1099<dd>
1100<p>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]1101 An <a href="#def_object">object</a> containing a list of file names and modes along
1102 with refs to the associated blob and/or tree objects. A
1103 <a href="#def_tree">tree</a> is equivalent to a <a href="#def_directory">directory</a>.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1104</p>
1105</dd>
1106<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]1107<a id="def_tree-ish"></a>tree-ish
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1108</dt>
1109<dd>
1110<p>
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]1111 A <a href="#def_ref">ref</a> pointing to either a <a href="#def_commit_object">commit object</a>, a <a href="#def_tree_object">tree object</a>, or a <a href="#def_tag_object">tag object</a> pointing to a tag or commit or tree object.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1112</p>
1113</dd>
1114<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]1115<a id="def_unmerged_index"></a>unmerged index
Junio C Hamano21c0b422006-10-12 19:10:36[diff] [blame]1116</dt>
1117<dd>
1118<p>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]1119 An <a href="#def_index">index</a> which contains unmerged
1120 <a href="#def_index_entry">index entries</a>.
Junio C Hamano21c0b422006-10-12 19:10:36[diff] [blame]1121</p>
1122</dd>
1123<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]1124<a id="def_unreachable_object"></a>unreachable object
Junio C Hamanoaa83a7d2007-03-05 02:37:29[diff] [blame]1125</dt>
1126<dd>
1127<p>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]1128 An <a href="#def_object">object</a> which is not <a href="#def_reachable">reachable</a> from a
1129 <a href="#def_branch">branch</a>, <a href="#def_tag">tag</a>, or any other reference.
Junio C Hamanoaa83a7d2007-03-05 02:37:29[diff] [blame]1130</p>
1131</dd>
1132<dt>
Junio C Hamano3d5b41f2007-03-26 02:33:41[diff] [blame]1133<a id="def_working_tree"></a>working tree
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1134</dt>
1135<dd>
1136<p>
Junio C Hamano75485c82007-05-19 04:20:33[diff] [blame]1137 The tree of actual checked out files. The working tree is
1138 normally equal to the <a href="#def_HEAD">HEAD</a> plus any local changes
1139 that you have made but not yet committed.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1140</p>
1141</dd>
Junio C Hamanod32738e2008-07-09 19:53:42[diff] [blame]1142</dl></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1143</div>
Junio C Hamanod32738e2008-07-09 19:53:42[diff] [blame]1144<h2 id="_see_also">SEE ALSO</h2>
Junio C Hamano9e1793f2008-06-02 07:31:16[diff] [blame]1145<div class="sectionbody">
Junio C Hamanod3452a02008-11-15 08:07:55[diff] [blame]1146<div class="para"><p><a href="gittutorial.html">gittutorial(7)</a>,
1147<a href="gittutorial-2.html">gittutorial-2(7)</a>,
1148<a href="gitcvs-migration.html">gitcvs-migration(7)</a>,
1149<a href="everyday.html">Everyday git</a>,
Junio C Hamanod32738e2008-07-09 19:53:42[diff] [blame]1150<a href="user-manual.html">The Git User's Manual</a></p></div>
Junio C Hamano9e1793f2008-06-02 07:31:16[diff] [blame]1151</div>
Junio C Hamanod32738e2008-07-09 19:53:42[diff] [blame]1152<h2 id="_git">GIT</h2>
Junio C Hamano9e1793f2008-06-02 07:31:16[diff] [blame]1153<div class="sectionbody">
Junio C Hamanod32738e2008-07-09 19:53:42[diff] [blame]1154<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1155</div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1156<div id="footer">
1157<div id="footer-text">
Junio C Hamanoea82cff2009-03-18 01:54:48[diff] [blame^]1158Last updated 2009-03-18 01:54:23 UTC
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1159</div>
1160</div>
1161</body>
1162</html>