]>
Commit | Line | Data |
---|---|---|
f562e6f3 | 1 | [[def_alternate_object_database]]alternate object database:: |
343cad92 BF |
2 | Via the alternates mechanism, a <<def_repository,repository>> |
3 | can inherit part of its <<def_object_database,object database>> | |
4 | from another object database, which is called "alternate". | |
f562e6f3 BF |
5 | |
6 | [[def_bare_repository]]bare repository:: | |
343cad92 | 7 | A bare repository is normally an appropriately |
f562e6f3 BF |
8 | named <<def_directory,directory>> with a `.git` suffix that does not |
9 | have a locally checked-out copy of any of the files under | |
2de9b711 | 10 | revision control. That is, all of the Git |
f562e6f3 BF |
11 | administrative and control files that would normally be present in the |
12 | hidden `.git` sub-directory are directly present in the | |
cbd91922 | 13 | `repository.git` directory instead, |
f562e6f3 BF |
14 | and no other files are present and checked out. Usually publishers of |
15 | public repositories make bare repositories available. | |
16 | ||
17 | [[def_blob_object]]blob object:: | |
18 | Untyped <<def_object,object>>, e.g. the contents of a file. | |
19 | ||
20 | [[def_branch]]branch:: | |
343cad92 BF |
21 | A "branch" is an active line of development. The most recent |
22 | <<def_commit,commit>> on a branch is referred to as the tip of | |
23 | that branch. The tip of the branch is referenced by a branch | |
24 | <<def_head,head>>, which moves forward as additional development | |
2de9b711 | 25 | is done on the branch. A single Git |
343cad92 BF |
26 | <<def_repository,repository>> can track an arbitrary number of |
27 | branches, but your <<def_working_tree,working tree>> is | |
28 | associated with just one of them (the "current" or "checked out" | |
29 | branch), and <<def_HEAD,HEAD>> points to that branch. | |
f562e6f3 BF |
30 | |
31 | [[def_cache]]cache:: | |
32 | Obsolete for: <<def_index,index>>. | |
33 | ||
34 | [[def_chain]]chain:: | |
35 | A list of objects, where each <<def_object,object>> in the list contains | |
36 | a reference to its successor (for example, the successor of a | |
a58f3c01 | 37 | <<def_commit,commit>> could be one of its <<def_parent,parents>>). |
f562e6f3 BF |
38 | |
39 | [[def_changeset]]changeset:: | |
2de9b711 | 40 | BitKeeper/cvsps speak for "<<def_commit,commit>>". Since Git does not |
f562e6f3 | 41 | store changes, but states, it really does not make sense to use the term |
2de9b711 | 42 | "changesets" with Git. |
f562e6f3 BF |
43 | |
44 | [[def_checkout]]checkout:: | |
76ce9462 JP |
45 | The action of updating all or part of the |
46 | <<def_working_tree,working tree>> with a <<def_tree_object,tree object>> | |
47 | or <<def_blob_object,blob>> from the | |
48 | <<def_object_database,object database>>, and updating the | |
49 | <<def_index,index>> and <<def_HEAD,HEAD>> if the whole working tree has | |
50 | been pointed at a new <<def_branch,branch>>. | |
f562e6f3 BF |
51 | |
52 | [[def_cherry-picking]]cherry-picking:: | |
53 | In <<def_SCM,SCM>> jargon, "cherry pick" means to choose a subset of | |
54 | changes out of a series of changes (typically commits) and record them | |
48a8c26c | 55 | as a new series of changes on top of a different codebase. In Git, this is |
06ada152 | 56 | performed by the "git cherry-pick" command to extract the change introduced |
f562e6f3 | 57 | by an existing <<def_commit,commit>> and to record it based on the tip |
343cad92 | 58 | of the current <<def_branch,branch>> as a new commit. |
f562e6f3 BF |
59 | |
60 | [[def_clean]]clean:: | |
343cad92 | 61 | A <<def_working_tree,working tree>> is clean, if it |
f562e6f3 BF |
62 | corresponds to the <<def_revision,revision>> referenced by the current |
63 | <<def_head,head>>. Also see "<<def_dirty,dirty>>". | |
64 | ||
65 | [[def_commit]]commit:: | |
343cad92 | 66 | As a noun: A single point in the |
2de9b711 | 67 | Git history; the entire history of a project is represented as a |
343cad92 | 68 | set of interrelated commits. The word "commit" is often |
2de9b711 | 69 | used by Git in the same places other revision control systems |
343cad92 BF |
70 | use the words "revision" or "version". Also used as a short |
71 | hand for <<def_commit_object,commit object>>. | |
72 | + | |
73 | As a verb: The action of storing a new snapshot of the project's | |
2de9b711 | 74 | state in the Git history, by creating a new commit representing the current |
343cad92 BF |
75 | state of the <<def_index,index>> and advancing <<def_HEAD,HEAD>> |
76 | to point at the new commit. | |
f562e6f3 BF |
77 | |
78 | [[def_commit_object]]commit object:: | |
79 | An <<def_object,object>> which contains the information about a | |
a58f3c01 | 80 | particular <<def_revision,revision>>, such as <<def_parent,parents>>, committer, |
f562e6f3 BF |
81 | author, date and the <<def_tree_object,tree object>> which corresponds |
82 | to the top <<def_directory,directory>> of the stored | |
a58f3c01 | 83 | revision. |
f562e6f3 | 84 | |
406fde17 RH |
85 | [[def_commit-ish]]commit-ish (also committish):: |
86 | A <<def_commit_object,commit object>> or an | |
87 | <<def_object,object>> that can be recursively dereferenced to | |
88 | a commit object. | |
89 | The following are all commit-ishes: | |
90 | a commit object, | |
91 | a <<def_tag_object,tag object>> that points to a commit | |
92 | object, | |
93 | a tag object that points to a tag object that points to a | |
94 | commit object, | |
95 | etc. | |
96 | ||
2de9b711 TA |
97 | [[def_core_git]]core Git:: |
98 | Fundamental data structures and utilities of Git. Exposes only limited | |
f562e6f3 BF |
99 | source code management tools. |
100 | ||
101 | [[def_DAG]]DAG:: | |
850d3a7c | 102 | Directed acyclic graph. The <<def_commit_object,commit objects>> form a |
f562e6f3 | 103 | directed acyclic graph, because they have parents (directed), and the |
850d3a7c LW |
104 | graph of commit objects is acyclic (there is no <<def_chain,chain>> |
105 | which begins and ends with the same <<def_object,object>>). | |
f562e6f3 BF |
106 | |
107 | [[def_dangling_object]]dangling object:: | |
108 | An <<def_unreachable_object,unreachable object>> which is not | |
109 | <<def_reachable,reachable>> even from other unreachable objects; a | |
343cad92 | 110 | dangling object has no references to it from any |
f562e6f3 BF |
111 | reference or <<def_object,object>> in the <<def_repository,repository>>. |
112 | ||
343cad92 BF |
113 | [[def_detached_HEAD]]detached HEAD:: |
114 | Normally the <<def_HEAD,HEAD>> stores the name of a | |
1d77d249 JH |
115 | <<def_branch,branch>>, and commands that operate on the |
116 | history HEAD represents operate on the history leading to the | |
117 | tip of the branch the HEAD points at. However, Git also | |
118 | allows you to <<def_checkout,check out>> an arbitrary | |
119 | <<def_commit,commit>> that isn't necessarily the tip of any | |
120 | particular branch. The HEAD in such a state is called | |
121 | "detached". | |
122 | + | |
123 | Note that commands that operate on the history of the current branch | |
124 | (e.g. `git commit` to build a new history on top of it) still work | |
125 | while the HEAD is detached. They update the HEAD to point at the tip | |
126 | of the updated history without affecting any branch. Commands that | |
127 | update or inquire information _about_ the current branch (e.g. `git | |
d6ac1d21 | 128 | branch --set-upstream-to` that sets what remote-tracking branch the |
1d77d249 JH |
129 | current branch integrates with) obviously do not work, as there is no |
130 | (real) current branch to ask about in this state. | |
343cad92 | 131 | |
f562e6f3 | 132 | [[def_directory]]directory:: |
aa9b1573 | 133 | The list you get with "ls" :-) |
da139813 | 134 | |
f562e6f3 | 135 | [[def_dirty]]dirty:: |
343cad92 | 136 | A <<def_working_tree,working tree>> is said to be "dirty" if |
a58f3c01 | 137 | it contains modifications which have not been <<def_commit,committed>> to the current |
f562e6f3 BF |
138 | <<def_branch,branch>>. |
139 | ||
c1bab288 JN |
140 | [[def_evil_merge]]evil merge:: |
141 | An evil merge is a <<def_merge,merge>> that introduces changes that | |
142 | do not appear in any <<def_parent,parent>>. | |
143 | ||
a75d7b54 | 144 | [[def_fast_forward]]fast-forward:: |
f562e6f3 BF |
145 | A fast-forward is a special type of <<def_merge,merge>> where you have a |
146 | <<def_revision,revision>> and you are "merging" another | |
147 | <<def_branch,branch>>'s changes that happen to be a descendant of what | |
148 | you have. In such these cases, you do not make a new <<def_merge,merge>> | |
149 | <<def_commit,commit>> but instead just update to his | |
343cad92 | 150 | revision. This will happen frequently on a |
8b3f3f84 | 151 | <<def_remote_tracking_branch,remote-tracking branch>> of a remote |
f562e6f3 BF |
152 | <<def_repository,repository>>. |
153 | ||
154 | [[def_fetch]]fetch:: | |
155 | Fetching a <<def_branch,branch>> means to get the | |
343cad92 BF |
156 | branch's <<def_head_ref,head ref>> from a remote |
157 | <<def_repository,repository>>, to find out which objects are | |
158 | missing from the local <<def_object_database,object database>>, | |
5162e697 | 159 | and to get them, too. See also linkgit:git-fetch[1]. |
f562e6f3 BF |
160 | |
161 | [[def_file_system]]file system:: | |
2de9b711 | 162 | Linus Torvalds originally designed Git to be a user space file system, |
f562e6f3 | 163 | i.e. the infrastructure to hold files and directories. That ensured the |
2de9b711 | 164 | efficiency and speed of Git. |
f562e6f3 | 165 | |
2de9b711 | 166 | [[def_git_archive]]Git archive:: |
f562e6f3 BF |
167 | Synonym for <<def_repository,repository>> (for arch people). |
168 | ||
19b4d3d4 TA |
169 | [[def_gitfile]]gitfile:: |
170 | A plain file `.git` at the root of a working tree that | |
171 | points at the directory that is the real repository. | |
172 | ||
f562e6f3 BF |
173 | [[def_grafts]]grafts:: |
174 | Grafts enables two otherwise different lines of development to be joined | |
175 | together by recording fake ancestry information for commits. This way | |
2de9b711 | 176 | you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has |
343cad92 | 177 | is different from what was recorded when the commit was |
cbd91922 | 178 | created. Configured via the `.git/info/grafts` file. |
f562e6f3 BF |
179 | |
180 | [[def_hash]]hash:: | |
3ab50120 | 181 | In Git's context, synonym for <<def_object_name,object name>>. |
f562e6f3 BF |
182 | |
183 | [[def_head]]head:: | |
a58f3c01 | 184 | A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a |
deaef1e9 JH |
185 | <<def_branch,branch>>. Heads are stored in a file in |
186 | `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See | |
5162e697 | 187 | linkgit:git-pack-refs[1].) |
343cad92 BF |
188 | |
189 | [[def_HEAD]]HEAD:: | |
a58f3c01 | 190 | The current <<def_branch,branch>>. In more detail: Your <<def_working_tree, |
343cad92 BF |
191 | working tree>> is normally derived from the state of the tree |
192 | referred to by HEAD. HEAD is a reference to one of the | |
193 | <<def_head,heads>> in your repository, except when using a | |
67393c5d JH |
194 | <<def_detached_HEAD,detached HEAD>>, in which case it directly |
195 | references an arbitrary commit. | |
f562e6f3 BF |
196 | |
197 | [[def_head_ref]]head ref:: | |
343cad92 | 198 | A synonym for <<def_head,head>>. |
f562e6f3 BF |
199 | |
200 | [[def_hook]]hook:: | |
2de9b711 | 201 | During the normal execution of several Git commands, call-outs are made |
f562e6f3 BF |
202 | to optional scripts that allow a developer to add functionality or |
203 | checking. Typically, the hooks allow for a command to be pre-verified | |
204 | and potentially aborted, and allow for a post-notification after the | |
343cad92 | 205 | operation is done. The hook scripts are found in the |
a58f3c01 | 206 | `$GIT_DIR/hooks/` directory, and are enabled by simply |
d1983677 | 207 | removing the `.sample` suffix from the filename. In earlier versions |
2de9b711 | 208 | of Git you had to make them executable. |
f562e6f3 BF |
209 | |
210 | [[def_index]]index:: | |
211 | A collection of files with stat information, whose contents are stored | |
a58f3c01 JN |
212 | as objects. The index is a stored version of your |
213 | <<def_working_tree,working tree>>. Truth be told, it can also contain a second, and even | |
214 | a third version of a working tree, which are used | |
215 | when <<def_merge,merging>>. | |
f562e6f3 BF |
216 | |
217 | [[def_index_entry]]index entry:: | |
218 | The information regarding a particular file, stored in the | |
343cad92 BF |
219 | <<def_index,index>>. An index entry can be unmerged, if a |
220 | <<def_merge,merge>> was started, but not yet finished (i.e. if | |
221 | the index contains multiple versions of that file). | |
f562e6f3 BF |
222 | |
223 | [[def_master]]master:: | |
343cad92 | 224 | The default development <<def_branch,branch>>. Whenever you |
2de9b711 | 225 | create a Git <<def_repository,repository>>, a branch named |
343cad92 BF |
226 | "master" is created, and becomes the active branch. In most |
227 | cases, this contains the local development, though that is | |
228 | purely by convention and is not required. | |
da139813 | 229 | |
f562e6f3 | 230 | [[def_merge]]merge:: |
343cad92 BF |
231 | As a verb: To bring the contents of another |
232 | <<def_branch,branch>> (possibly from an external | |
233 | <<def_repository,repository>>) into the current branch. In the | |
234 | case where the merged-in branch is from a different repository, | |
235 | this is done by first <<def_fetch,fetching>> the remote branch | |
236 | and then merging the result into the current branch. This | |
237 | combination of fetch and merge operations is called a | |
238 | <<def_pull,pull>>. Merging is performed by an automatic process | |
239 | that identifies changes made since the branches diverged, and | |
240 | then applies all those changes together. In cases where changes | |
241 | conflict, manual intervention may be required to complete the | |
242 | merge. | |
243 | + | |
a75d7b54 | 244 | As a noun: unless it is a <<def_fast_forward,fast-forward>>, a |
343cad92 BF |
245 | successful merge results in the creation of a new <<def_commit,commit>> |
246 | representing the result of the merge, and having as | |
247 | <<def_parent,parents>> the tips of the merged <<def_branch,branches>>. | |
248 | This commit is referred to as a "merge commit", or sometimes just a | |
249 | "merge". | |
f562e6f3 BF |
250 | |
251 | [[def_object]]object:: | |
2de9b711 | 252 | The unit of storage in Git. It is uniquely identified by the |
3ab50120 | 253 | <<def_SHA1,SHA-1>> of its contents. Consequently, an |
343cad92 | 254 | object can not be changed. |
f562e6f3 BF |
255 | |
256 | [[def_object_database]]object database:: | |
257 | Stores a set of "objects", and an individual <<def_object,object>> is | |
258 | identified by its <<def_object_name,object name>>. The objects usually | |
259 | live in `$GIT_DIR/objects/`. | |
260 | ||
261 | [[def_object_identifier]]object identifier:: | |
262 | Synonym for <<def_object_name,object name>>. | |
263 | ||
264 | [[def_object_name]]object name:: | |
3ab50120 TA |
265 | The unique identifier of an <<def_object,object>>. The |
266 | object name is usually represented by a 40 character | |
267 | hexadecimal string. Also colloquially called <<def_SHA1,SHA-1>>. | |
f562e6f3 BF |
268 | |
269 | [[def_object_type]]object type:: | |
850d3a7c LW |
270 | One of the identifiers "<<def_commit_object,commit>>", |
271 | "<<def_tree_object,tree>>", "<<def_tag_object,tag>>" or | |
272 | "<<def_blob_object,blob>>" describing the type of an | |
273 | <<def_object,object>>. | |
f562e6f3 BF |
274 | |
275 | [[def_octopus]]octopus:: | |
79de4558 | 276 | To <<def_merge,merge>> more than two <<def_branch,branches>>. |
f562e6f3 BF |
277 | |
278 | [[def_origin]]origin:: | |
279 | The default upstream <<def_repository,repository>>. Most projects have | |
280 | at least one upstream project which they track. By default | |
343cad92 | 281 | 'origin' is used for that purpose. New upstream updates |
d6ac1d21 | 282 | will be fetched into <<def_remote_tracking_branch,remote-tracking branches>> named |
cbd91922 | 283 | origin/name-of-upstream-branch, which you can see using |
dcb11263 | 284 | `git branch -r`. |
f1671ecb | 285 | |
f562e6f3 BF |
286 | [[def_pack]]pack:: |
287 | A set of objects which have been compressed into one file (to save space | |
288 | or to transmit them efficiently). | |
da139813 | 289 | |
f562e6f3 | 290 | [[def_pack_index]]pack index:: |
aa9b1573 | 291 | The list of identifiers, and other information, of the objects in a |
f562e6f3 | 292 | <<def_pack,pack>>, to assist in efficiently accessing the contents of a |
343cad92 | 293 | pack. |
f562e6f3 | 294 | |
3bd2bcfa | 295 | [[def_pathspec]]pathspec:: |
57148ebb | 296 | Pattern used to limit paths in Git commands. |
3bd2bcfa JN |
297 | + |
298 | Pathspecs are used on the command line of "git ls-files", "git | |
8a42c985 JH |
299 | ls-tree", "git add", "git grep", "git diff", "git checkout", |
300 | and many other commands to | |
3bd2bcfa JN |
301 | limit the scope of operations to some subset of the tree or |
302 | worktree. See the documentation of each command for whether | |
303 | paths are relative to the current directory or toplevel. The | |
304 | pathspec syntax is as follows: | |
57148ebb TA |
305 | + |
306 | -- | |
3bd2bcfa JN |
307 | |
308 | * any path matches itself | |
309 | * the pathspec up to the last slash represents a | |
310 | directory prefix. The scope of that pathspec is | |
311 | limited to that subtree. | |
312 | * the rest of the pathspec is a pattern for the remainder | |
313 | of the pathname. Paths relative to the directory | |
314 | prefix will be matched against that pattern using fnmatch(3); | |
315 | in particular, '*' and '?' _can_ match directory separators. | |
57148ebb TA |
316 | |
317 | -- | |
3bd2bcfa JN |
318 | + |
319 | For example, Documentation/*.jpg will match all .jpg files | |
320 | in the Documentation subtree, | |
321 | including Documentation/chapter_1/figure_1.jpg. | |
8a42c985 JH |
322 | + |
323 | A pathspec that begins with a colon `:` has special meaning. In the | |
324 | short form, the leading colon `:` is followed by zero or more "magic | |
325 | signature" letters (which optionally is terminated by another colon `:`), | |
326 | and the remainder is the pattern to match against the path. The optional | |
327 | colon that terminates the "magic signature" can be omitted if the pattern | |
328 | begins with a character that cannot be a "magic signature" and is not a | |
329 | colon. | |
330 | + | |
331 | In the long form, the leading colon `:` is followed by a open | |
332 | parenthesis `(`, a comma-separated list of zero or more "magic words", | |
333 | and a close parentheses `)`, and the remainder is the pattern to match | |
334 | against the path. | |
335 | + | |
336 | The "magic signature" consists of an ASCII symbol that is not | |
5c6933d2 NTND |
337 | alphanumeric. |
338 | + | |
339 | -- | |
340 | top `/`;; | |
341 | The magic word `top` (mnemonic: `/`) makes the pattern match | |
342 | from the root of the working tree, even when you are running | |
343 | the command from inside a subdirectory. | |
344 | ||
345 | literal;; | |
346 | Wildcards in the pattern such as `*` or `?` are treated | |
347 | as literal characters. | |
bd30c2e4 | 348 | |
93d93537 NTND |
349 | icase;; |
350 | Case insensitive match. | |
351 | ||
bd30c2e4 NTND |
352 | glob;; |
353 | Git treats the pattern as a shell glob suitable for | |
354 | consumption by fnmatch(3) with the FNM_PATHNAME flag: | |
355 | wildcards in the pattern will not match a / in the pathname. | |
356 | For example, "Documentation/{asterisk}.html" matches | |
357 | "Documentation/git.html" but not "Documentation/ppc/ppc.html" | |
358 | or "tools/perf/Documentation/perf.html". | |
359 | + | |
360 | Two consecutive asterisks ("`**`") in patterns matched against | |
361 | full pathname may have special meaning: | |
362 | ||
363 | - A leading "`**`" followed by a slash means match in all | |
364 | directories. For example, "`**/foo`" matches file or directory | |
365 | "`foo`" anywhere, the same as pattern "`foo`". "**/foo/bar" | |
366 | matches file or directory "`bar`" anywhere that is directly | |
367 | under directory "`foo`". | |
368 | ||
369 | - A trailing "/**" matches everything inside. For example, | |
370 | "abc/**" matches all files inside directory "abc", relative | |
371 | to the location of the `.gitignore` file, with infinite depth. | |
372 | ||
373 | - A slash followed by two consecutive asterisks then a slash | |
374 | matches zero or more directories. For example, "`a/**/b`" | |
375 | matches "`a/b`", "`a/x/b`", "`a/x/y/b`" and so on. | |
376 | ||
377 | - Other consecutive asterisks are considered invalid. | |
378 | + | |
379 | Glob magic is incompatible with literal magic. | |
5c6933d2 NTND |
380 | -- |
381 | + | |
382 | Currently only the slash `/` is recognized as the "magic signature", | |
383 | but it is envisioned that we will support more types of magic in later | |
384 | versions of Git. | |
6fd09f53 NTND |
385 | + |
386 | A pathspec with only a colon means "there is no pathspec". This form | |
387 | should not be combined with other pathspec. | |
8a42c985 | 388 | |
f562e6f3 BF |
389 | [[def_parent]]parent:: |
390 | A <<def_commit_object,commit object>> contains a (possibly empty) list | |
391 | of the logical predecessor(s) in the line of development, i.e. its | |
392 | parents. | |
393 | ||
394 | [[def_pickaxe]]pickaxe:: | |
395 | The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore | |
396 | routines that help select changes that add or delete a given text | |
b6cbca38 | 397 | string. With the `--pickaxe-all` option, it can be used to view the full |
f562e6f3 | 398 | <<def_changeset,changeset>> that introduced or removed, say, a |
5162e697 | 399 | particular line of text. See linkgit:git-diff[1]. |
f562e6f3 BF |
400 | |
401 | [[def_plumbing]]plumbing:: | |
2de9b711 | 402 | Cute name for <<def_core_git,core Git>>. |
f562e6f3 BF |
403 | |
404 | [[def_porcelain]]porcelain:: | |
405 | Cute name for programs and program suites depending on | |
2de9b711 TA |
406 | <<def_core_git,core Git>>, presenting a high level access to |
407 | core Git. Porcelains expose more of a <<def_SCM,SCM>> | |
f562e6f3 BF |
408 | interface than the <<def_plumbing,plumbing>>. |
409 | ||
410 | [[def_pull]]pull:: | |
411 | Pulling a <<def_branch,branch>> means to <<def_fetch,fetch>> it and | |
5162e697 | 412 | <<def_merge,merge>> it. See also linkgit:git-pull[1]. |
f562e6f3 BF |
413 | |
414 | [[def_push]]push:: | |
343cad92 | 415 | Pushing a <<def_branch,branch>> means to get the branch's |
f562e6f3 | 416 | <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, |
2c619db8 RW |
417 | find out if it is a direct ancestor to the branch's local |
418 | head ref, and in that case, putting all | |
f562e6f3 | 419 | objects, which are <<def_reachable,reachable>> from the local |
343cad92 BF |
420 | head ref, and which are missing from the remote |
421 | repository, into the remote | |
f562e6f3 | 422 | <<def_object_database,object database>>, and updating the remote |
343cad92 BF |
423 | head ref. If the remote <<def_head,head>> is not an |
424 | ancestor to the local head, the push fails. | |
f562e6f3 BF |
425 | |
426 | [[def_reachable]]reachable:: | |
427 | All of the ancestors of a given <<def_commit,commit>> are said to be | |
343cad92 BF |
428 | "reachable" from that commit. More |
429 | generally, one <<def_object,object>> is reachable from | |
f562e6f3 | 430 | another if we can reach the one from the other by a <<def_chain,chain>> |
cbd91922 BF |
431 | that follows <<def_tag,tags>> to whatever they tag, |
432 | <<def_commit_object,commits>> to their parents or trees, and | |
433 | <<def_tree_object,trees>> to the trees or <<def_blob_object,blobs>> | |
434 | that they contain. | |
f562e6f3 BF |
435 | |
436 | [[def_rebase]]rebase:: | |
cbd91922 BF |
437 | To reapply a series of changes from a <<def_branch,branch>> to a |
438 | different base, and reset the <<def_head,head>> of that branch | |
439 | to the result. | |
f562e6f3 BF |
440 | |
441 | [[def_ref]]ref:: | |
4b6acde5 RH |
442 | A name that begins with `refs/` (e.g. `refs/heads/master`) |
443 | that points to an <<def_object_name,object name>> or another | |
444 | ref (the latter is called a <<def_symref,symbolic ref>>). | |
445 | For convenience, a ref can sometimes be abbreviated when used | |
446 | as an argument to a Git command; see linkgit:gitrevisions[7] | |
447 | for details. | |
448 | Refs are stored in the <<def_repository,repository>>. | |
449 | + | |
450 | The ref namespace is hierarchical. | |
451 | Different subhierarchies are used for different purposes (e.g. the | |
452 | `refs/heads/` hierarchy is used to represent local branches). | |
453 | + | |
454 | There are a few special-purpose refs that do not begin with `refs/`. | |
455 | The most notable example is `HEAD`. | |
f562e6f3 | 456 | |
f8d69576 JS |
457 | [[def_reflog]]reflog:: |
458 | A reflog shows the local "history" of a ref. In other words, | |
459 | it can tell you what the 3rd last revision in _this_ repository | |
460 | was, and what was the current state in _this_ repository, | |
5162e697 | 461 | yesterday 9:14pm. See linkgit:git-reflog[1] for details. |
f8d69576 | 462 | |
f562e6f3 | 463 | [[def_refspec]]refspec:: |
a58f3c01 | 464 | A "refspec" is used by <<def_fetch,fetch>> and |
343cad92 | 465 | <<def_push,push>> to describe the mapping between remote |
57148ebb | 466 | <<def_ref,ref>> and local ref. |
f562e6f3 | 467 | |
8b3f3f84 | 468 | [[def_remote_tracking_branch]]remote-tracking branch:: |
229177aa JH |
469 | A <<def_ref,ref>> that is used to follow changes from another |
470 | <<def_repository,repository>>. It typically looks like | |
471 | 'refs/remotes/foo/bar' (indicating that it tracks a branch named | |
472 | 'bar' in a remote named 'foo'), and matches the right-hand-side of | |
473 | a configured fetch <<def_refspec,refspec>>. A remote-tracking | |
474 | branch should not contain direct modifications or have local | |
475 | commits made to it. | |
8b3f3f84 | 476 | |
f562e6f3 | 477 | [[def_repository]]repository:: |
a58f3c01 | 478 | A collection of <<def_ref,refs>> together with an |
343cad92 BF |
479 | <<def_object_database,object database>> containing all objects |
480 | which are <<def_reachable,reachable>> from the refs, possibly | |
a58f3c01 JN |
481 | accompanied by meta data from one or more <<def_porcelain,porcelains>>. A |
482 | repository can share an object database with other repositories | |
483 | via <<def_alternate_object_database,alternates mechanism>>. | |
f562e6f3 BF |
484 | |
485 | [[def_resolve]]resolve:: | |
486 | The action of fixing up manually what a failed automatic | |
487 | <<def_merge,merge>> left behind. | |
488 | ||
489 | [[def_revision]]revision:: | |
dfb44106 | 490 | Synonym for <<def_commit,commit>> (the noun). |
f562e6f3 BF |
491 | |
492 | [[def_rewind]]rewind:: | |
493 | To throw away part of the development, i.e. to assign the | |
494 | <<def_head,head>> to an earlier <<def_revision,revision>>. | |
495 | ||
496 | [[def_SCM]]SCM:: | |
da139813 JS |
497 | Source code management (tool). |
498 | ||
3ab50120 TA |
499 | [[def_SHA1]]SHA-1:: |
500 | "Secure Hash Algorithm 1"; a cryptographic hash function. | |
501 | In the context of Git used as a synonym for <<def_object_name,object name>>. | |
f562e6f3 BF |
502 | |
503 | [[def_shallow_repository]]shallow repository:: | |
a58f3c01 JN |
504 | A shallow <<def_repository,repository>> has an incomplete |
505 | history some of whose <<def_commit,commits>> have <<def_parent,parents>> cauterized away (in other | |
2de9b711 | 506 | words, Git is told to pretend that these commits do not have the |
f562e6f3 BF |
507 | parents, even though they are recorded in the <<def_commit_object,commit |
508 | object>>). This is sometimes useful when you are interested only in the | |
509 | recent history of a project even though the real history recorded in the | |
343cad92 | 510 | upstream is much larger. A shallow repository |
5162e697 DM |
511 | is created by giving the `--depth` option to linkgit:git-clone[1], and |
512 | its history can be later deepened with linkgit:git-fetch[1]. | |
428ddc5d | 513 | |
f562e6f3 | 514 | [[def_symref]]symref:: |
3ab50120 | 515 | Symbolic reference: instead of containing the <<def_SHA1,SHA-1>> |
343cad92 BF |
516 | id itself, it is of the format 'ref: refs/some/thing' and when |
517 | referenced, it recursively dereferences to this reference. | |
518 | '<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic | |
5162e697 | 519 | references are manipulated with the linkgit:git-symbolic-ref[1] |
343cad92 | 520 | command. |
f562e6f3 BF |
521 | |
522 | [[def_tag]]tag:: | |
487b0441 JH |
523 | A <<def_ref,ref>> under `refs/tags/` namespace that points to an |
524 | object of an arbitrary type (typically a tag points to either a | |
525 | <<def_tag_object,tag>> or a <<def_commit_object,commit object>>). | |
526 | In contrast to a <<def_head,head>>, a tag is not updated by | |
2de9b711 | 527 | the `commit` command. A Git tag has nothing to do with a Lisp |
487b0441 | 528 | tag (which would be called an <<def_object_type,object type>> |
2de9b711 | 529 | in Git's context). A tag is most typically used to mark a particular |
487b0441 | 530 | point in the commit ancestry <<def_chain,chain>>. |
f562e6f3 BF |
531 | |
532 | [[def_tag_object]]tag object:: | |
533 | An <<def_object,object>> containing a <<def_ref,ref>> pointing to | |
343cad92 | 534 | another object, which can contain a message just like a |
f562e6f3 | 535 | <<def_commit_object,commit object>>. It can also contain a (PGP) |
a58f3c01 | 536 | signature, in which case it is called a "signed tag object". |
f562e6f3 BF |
537 | |
538 | [[def_topic_branch]]topic branch:: | |
2de9b711 | 539 | A regular Git <<def_branch,branch>> that is used by a developer to |
f562e6f3 BF |
540 | identify a conceptual line of development. Since branches are very easy |
541 | and inexpensive, it is often desirable to have several small branches | |
542 | that each contain very well defined concepts or small incremental yet | |
543 | related changes. | |
544 | ||
f562e6f3 BF |
545 | [[def_tree]]tree:: |
546 | Either a <<def_working_tree,working tree>>, or a <<def_tree_object,tree | |
a58f3c01 | 547 | object>> together with the dependent <<def_blob_object,blob>> and tree objects |
343cad92 | 548 | (i.e. a stored representation of a working tree). |
f562e6f3 BF |
549 | |
550 | [[def_tree_object]]tree object:: | |
551 | An <<def_object,object>> containing a list of file names and modes along | |
cbd91922 | 552 | with refs to the associated blob and/or tree objects. A |
f562e6f3 BF |
553 | <<def_tree,tree>> is equivalent to a <<def_directory,directory>>. |
554 | ||
36a2a54d | 555 | [[def_tree-ish]]tree-ish (also treeish):: |
930f302c RH |
556 | A <<def_tree_object,tree object>> or an <<def_object,object>> |
557 | that can be recursively dereferenced to a tree object. | |
558 | Dereferencing a <<def_commit_object,commit object>> yields the | |
559 | tree object corresponding to the <<def_revision,revision>>'s | |
560 | top <<def_directory,directory>>. | |
561 | The following are all tree-ishes: | |
562 | a <<def_commit-ish,commit-ish>>, | |
563 | a tree object, | |
564 | a <<def_tag_object,tag object>> that points to a tree object, | |
565 | a tag object that points to a tag object that points to a tree | |
566 | object, | |
567 | etc. | |
f562e6f3 BF |
568 | |
569 | [[def_unmerged_index]]unmerged index:: | |
cbd91922 BF |
570 | An <<def_index,index>> which contains unmerged |
571 | <<def_index_entry,index entries>>. | |
f562e6f3 BF |
572 | |
573 | [[def_unreachable_object]]unreachable object:: | |
574 | An <<def_object,object>> which is not <<def_reachable,reachable>> from a | |
575 | <<def_branch,branch>>, <<def_tag,tag>>, or any other reference. | |
576 | ||
e892dc71 SB |
577 | [[def_upstream_branch]]upstream branch:: |
578 | The default <<def_branch,branch>> that is merged into the branch in | |
579 | question (or the branch in question is rebased onto). It is configured | |
580 | via branch.<name>.remote and branch.<name>.merge. If the upstream branch | |
581 | of 'A' is 'origin/B' sometimes we say "'A' is tracking 'origin/B'". | |
582 | ||
f562e6f3 | 583 | [[def_working_tree]]working tree:: |
580cbb58 JN |
584 | The tree of actual checked out files. The working tree normally |
585 | contains the contents of the <<def_HEAD,HEAD>> commit's tree, | |
586 | plus any local changes that you have made but not yet committed. |