1 <!DOCTYPE html PUBLIC
"-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3 <html xmlns=
"http://www.w3.org/1999/xhtml" xml:
lang=
"en">
5 <meta http-equiv=
"Content-Type" content=
"text/html; charset=UTF-8" />
6 <meta name=
"generator" content=
"AsciiDoc 8.4.5" />
7 <title>gitglossary(
7)
</title>
8 <style type=
"text/css">
10 p
, li
, dt
, dd
, div
, pre
, h1
, h2
, h3
, h4
, h5
, h6
{
12 border: 1px solid red;
17 margin: 1em 5% 1em 5%;
22 text-decoration: underline
;
42 h1
, h2
, h3
, h4
, h5
, h6
{
44 font-family: sans-serif
;
51 border-bottom: 2px solid silver
;
69 border: 1px solid silver
;
88 font-family: sans-serif
;
94 span#revnumber
, span#revdate
, span#revremark
{
95 font-family: sans-serif
;
99 font-family: sans-serif
;
101 border-top: 2px solid silver
;
107 padding-bottom: 0.5em;
111 padding-bottom: 0.5em;
116 margin-bottom: 1.5em;
118 div
.tableblock
, div
.imageblock
, div
.exampleblock
, div
.verseblock
,
119 div
.quoteblock
, div
.literalblock
, div
.listingblock
, div
.sidebarblock
,
120 div
.admonitionblock
{
122 margin-bottom: 1.5em;
124 div
.admonitionblock
{
126 margin-bottom: 2.5em;
129 div
.content
{ /* Block element content. */
133 /* Block element titles. */
134 div
.title
, caption
.title
{
136 font-family: sans-serif
;
140 margin-bottom: 0.5em;
146 td div
.title:first-child
{
149 div
.content div
.title:first-child
{
152 div
.content
+ div
.title
{
156 div
.sidebarblock
> div
.content
{
158 border: 1px solid silver
;
162 div
.listingblock
> div
.content
{
163 border: 1px solid silver
;
172 div
.quoteblock
> div
.attribution
{
181 div
.verseblock
> div
.content
{
184 div
.verseblock
> div
.attribution
{
188 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
189 div
.verseblock
+ div
.attribution
{
193 div
.admonitionblock
.icon
{
197 text-decoration: underline
;
199 padding-right: 0.5em;
201 div
.admonitionblock td
.content
{
203 border-left: 2px solid silver
;
206 div
.exampleblock
> div
.content
{
207 border-left: 2px solid silver
;
211 div
.imageblock div
.content
{ padding-left: 0; }
212 span
.image img
{ border-style: none
; }
213 a
.image:visited
{ color: white
; }
217 margin-bottom: 0.8em;
230 list-style-position: outside
;
233 list-style-type: decimal
;
236 list-style-type: lower-alpha
;
239 list-style-type: upper-alpha
;
242 list-style-type: lower-roman
;
245 list-style-type: upper-roman
;
248 div
.compact ul
, div
.compact ol
,
249 div
.compact p
, div
.compact p
,
250 div
.compact div
, div
.compact div
{
252 margin-bottom: 0.1em;
255 div
.tableblock
> table
{
256 border: 3px solid
#527bbd;
259 font-family: sans-serif
;
271 /* Because the table frame attribute is overriden by CSS in most browsers. */
272 div
.tableblock
> table
[frame
="void"] {
275 div
.tableblock
> table
[frame
="hsides"] {
276 border-left-style: none
;
277 border-right-style: none
;
279 div
.tableblock
> table
[frame
="vsides"] {
280 border-top-style: none
;
281 border-bottom-style: none
;
287 margin-bottom: 0.8em;
290 padding-bottom: 15px;
292 dt
.hdlist1
.strong
, td
.hdlist1
.strong
{
298 padding-right: 0.8em;
304 div
.hdlist
.compact tr
{
314 div#footer-badges
{ display: none
; }
319 font-family: sans-serif
;
323 margin-bottom: 0.1em;
326 div
.toclevel1
, div
.toclevel2
, div
.toclevel3
, div
.toclevel4
{
342 /* Overrides for manpage documents */
345 padding-bottom: 0.5em;
346 border-top: 2px solid silver
;
347 border-bottom: 2px solid silver
;
357 div#toc
{ display: none
; }
360 /* Workarounds for IE6's broken and incomplete CSS2. */
362 div
.sidebar-content
{
364 border: 1px solid silver
;
367 div
.sidebar-title
, div
.image-title
{
369 font-family: sans-serif
;
372 margin-bottom: 0.5em;
375 div
.listingblock div
.content
{
376 border: 1px solid silver
;
381 div
.quoteblock-attribution
{
386 div
.verseblock-content
{
389 div
.verseblock-attribution
{
394 div
.exampleblock-content
{
395 border-left: 2px solid silver
;
399 /* IE6 sets dynamically generated links as visited. */
400 div#toc
a:visited
{ color: blue
; }
406 gitglossary(
7) Manual Page
409 <div class=
"sectionbody">
415 <h2 id=
"_synopsis">SYNOPSIS
</h2>
416 <div class=
"sectionbody">
417 <div class=
"paragraph"><p>*
</p></div>
419 <h2 id=
"_description">DESCRIPTION
</h2>
420 <div class=
"sectionbody">
421 <div class=
"dlist"><dl>
423 <a id=
"def_alternate_object_database"></a>alternate object database
427 Via the alternates mechanism, a
<a href=
"#def_repository">repository
</a>
428 can inherit part of its
<a href=
"#def_object_database">object database
</a>
429 from another object database, which is called
"alternate".
433 <a id=
"def_bare_repository"></a>bare repository
437 A bare repository is normally an appropriately
438 named
<a href=
"#def_directory">directory
</a> with a
<tt>.git
</tt> suffix that does not
439 have a locally checked-out copy of any of the files under
440 revision control. That is, all of the
<tt>git
</tt>
441 administrative and control files that would normally be present in the
442 hidden
<tt>.git
</tt> sub-directory are directly present in the
443 <tt>repository.git
</tt> directory instead,
444 and no other files are present and checked out. Usually publishers of
445 public repositories make bare repositories available.
449 <a id=
"def_blob_object"></a>blob object
453 Untyped
<a href=
"#def_object">object
</a>, e.g. the contents of a file.
457 <a id=
"def_branch"></a>branch
461 A
"branch" is an active line of development. The most recent
462 <a href=
"#def_commit">commit
</a> on a branch is referred to as the tip of
463 that branch. The tip of the branch is referenced by a branch
464 <a href=
"#def_head">head
</a>, which moves forward as additional development
465 is done on the branch. A single git
466 <a href=
"#def_repository">repository
</a> can track an arbitrary number of
467 branches, but your
<a href=
"#def_working_tree">working tree
</a> is
468 associated with just one of them (the
"current" or
"checked out"
469 branch), and
<a href=
"#def_HEAD">HEAD
</a> points to that branch.
473 <a id=
"def_cache"></a>cache
477 Obsolete for:
<a href=
"#def_index">index
</a>.
481 <a id=
"def_chain"></a>chain
485 A list of objects, where each
<a href=
"#def_object">object
</a> in the list contains
486 a reference to its successor (for example, the successor of a
487 <a href=
"#def_commit">commit
</a> could be one of its
<a href=
"#def_parent">parents
</a>).
491 <a id=
"def_changeset"></a>changeset
495 BitKeeper/cvsps speak for
"<a href="#def_commit
">commit</a>". Since git does not
496 store changes, but states, it really does not make sense to use the term
497 "changesets" with git.
501 <a id=
"def_checkout"></a>checkout
505 The action of updating all or part of the
506 <a href=
"#def_working_tree">working tree
</a> with a
<a href=
"#def_tree_object">tree object
</a>
507 or
<a href=
"#def_blob_object">blob
</a> from the
508 <a href=
"#def_object_database">object database
</a>, and updating the
509 <a href=
"#def_index">index
</a> and
<a href=
"#def_HEAD">HEAD
</a> if the whole working tree has
510 been pointed at a new
<a href=
"#def_branch">branch
</a>.
514 <a id=
"def_cherry-picking"></a>cherry-picking
518 In
<a href=
"#def_SCM">SCM
</a> jargon,
"cherry pick" means to choose a subset of
519 changes out of a series of changes (typically commits) and record them
520 as a new series of changes on top of a different codebase. In GIT, this is
521 performed by the
"git cherry-pick" command to extract the change introduced
522 by an existing
<a href=
"#def_commit">commit
</a> and to record it based on the tip
523 of the current
<a href=
"#def_branch">branch
</a> as a new commit.
527 <a id=
"def_clean"></a>clean
531 A
<a href=
"#def_working_tree">working tree
</a> is clean, if it
532 corresponds to the
<a href=
"#def_revision">revision
</a> referenced by the current
533 <a href=
"#def_head">head
</a>. Also see
"<a href="#def_dirty
">dirty</a>".
537 <a id=
"def_commit"></a>commit
541 As a noun: A single point in the
542 git history; the entire history of a project is represented as a
543 set of interrelated commits. The word
"commit" is often
544 used by git in the same places other revision control systems
545 use the words
"revision" or
"version". Also used as a short
546 hand for
<a href=
"#def_commit_object">commit object
</a>.
548 <div class=
"paragraph"><p>As a verb: The action of storing a new snapshot of the project
’s
549 state in the git history, by creating a new commit representing the current
550 state of the
<a href=
"#def_index">index
</a> and advancing
<a href=
"#def_HEAD">HEAD
</a>
551 to point at the new commit.
</p></div>
554 <a id=
"def_commit_object"></a>commit object
558 An
<a href=
"#def_object">object
</a> which contains the information about a
559 particular
<a href=
"#def_revision">revision
</a>, such as
<a href=
"#def_parent">parents
</a>, committer,
560 author, date and the
<a href=
"#def_tree_object">tree object
</a> which corresponds
561 to the top
<a href=
"#def_directory">directory
</a> of the stored
566 <a id=
"def_core_git"></a>core git
570 Fundamental data structures and utilities of git. Exposes only limited
571 source code management tools.
575 <a id=
"def_DAG"></a>DAG
579 Directed acyclic graph. The
<a href=
"#def_commit_object">commit objects
</a> form a
580 directed acyclic graph, because they have parents (directed), and the
581 graph of commit objects is acyclic (there is no
<a href=
"#def_chain">chain
</a>
582 which begins and ends with the same
<a href=
"#def_object">object
</a>).
586 <a id=
"def_dangling_object"></a>dangling object
590 An
<a href=
"#def_unreachable_object">unreachable object
</a> which is not
591 <a href=
"#def_reachable">reachable
</a> even from other unreachable objects; a
592 dangling object has no references to it from any
593 reference or
<a href=
"#def_object">object
</a> in the
<a href=
"#def_repository">repository
</a>.
597 <a id=
"def_detached_HEAD"></a>detached HEAD
601 Normally the
<a href=
"#def_HEAD">HEAD
</a> stores the name of a
602 <a href=
"#def_branch">branch
</a>. However, git also allows you to
<a href=
"#def_checkout">check out
</a>
603 an arbitrary
<a href=
"#def_commit">commit
</a> that isn
’t necessarily the tip of any
604 particular branch. In this case HEAD is said to be
"detached".
608 <a id=
"def_dircache"></a>dircache
612 You are
<strong>waaaaay
</strong> behind. See
<a href=
"#def_index">index
</a>.
616 <a id=
"def_directory"></a>directory
620 The list you get with
"ls" :-)
624 <a id=
"def_dirty"></a>dirty
628 A
<a href=
"#def_working_tree">working tree
</a> is said to be
"dirty" if
629 it contains modifications which have not been
<a href=
"#def_commit">committed
</a> to the current
630 <a href=
"#def_branch">branch
</a>.
634 <a id=
"def_ent"></a>ent
638 Favorite synonym to
"<a href="#def_tree-ish
">tree-ish</a>" by some total geeks. See
639 <tt>http://en.wikipedia.org/wiki/Ent_(Middle-earth)
</tt> for an in-depth
640 explanation. Avoid this term, not to confuse people.
644 <a id=
"def_evil_merge"></a>evil merge
648 An evil merge is a
<a href=
"#def_merge">merge
</a> that introduces changes that
649 do not appear in any
<a href=
"#def_parent">parent
</a>.
653 <a id=
"def_fast_forward"></a>fast-forward
657 A fast-forward is a special type of
<a href=
"#def_merge">merge
</a> where you have a
658 <a href=
"#def_revision">revision
</a> and you are
"merging" another
659 <a href=
"#def_branch">branch
</a>'s changes that happen to be a descendant of what
660 you have. In such these cases, you do not make a new
<a href=
"#def_merge">merge
</a>
661 <a href=
"#def_commit">commit
</a> but instead just update to his
662 revision. This will happen frequently on a
663 <a href=
"#def_remote_tracking_branch">remote-tracking branch
</a> of a remote
664 <a href=
"#def_repository">repository
</a>.
668 <a id=
"def_fetch"></a>fetch
672 Fetching a
<a href=
"#def_branch">branch
</a> means to get the
673 branch
’s
<a href=
"#def_head_ref">head ref
</a> from a remote
674 <a href=
"#def_repository">repository
</a>, to find out which objects are
675 missing from the local
<a href=
"#def_object_database">object database
</a>,
676 and to get them, too. See also
<a href=
"git-fetch.html">git-fetch(
1)
</a>.
680 <a id=
"def_file_system"></a>file system
684 Linus Torvalds originally designed git to be a user space file system,
685 i.e. the infrastructure to hold files and directories. That ensured the
686 efficiency and speed of git.
690 <a id=
"def_git_archive"></a>git archive
694 Synonym for
<a href=
"#def_repository">repository
</a> (for arch people).
698 <a id=
"def_grafts"></a>grafts
702 Grafts enables two otherwise different lines of development to be joined
703 together by recording fake ancestry information for commits. This way
704 you can make git pretend the set of
<a href=
"#def_parent">parents
</a> a
<a href=
"#def_commit">commit
</a> has
705 is different from what was recorded when the commit was
706 created. Configured via the
<tt>.git/info/grafts
</tt> file.
710 <a id=
"def_hash"></a>hash
714 In git
’s context, synonym to
<a href=
"#def_object_name">object name
</a>.
718 <a id=
"def_head"></a>head
722 A
<a href=
"#def_ref">named reference
</a> to the
<a href=
"#def_commit">commit
</a> at the tip of a
723 <a href=
"#def_branch">branch
</a>. Heads are stored in
724 <tt>$GIT_DIR/refs/heads/
</tt>, except when using packed refs. (See
725 <a href=
"git-pack-refs.html">git-pack-refs(
1)
</a>.)
729 <a id=
"def_HEAD"></a>HEAD
733 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
734 referred to by HEAD. HEAD is a reference to one of the
735 <a href=
"#def_head">heads
</a> in your repository, except when using a
736 <a href=
"#def_detached_HEAD">detached HEAD
</a>, in which case it may
737 reference an arbitrary commit.
741 <a id=
"def_head_ref"></a>head ref
745 A synonym for
<a href=
"#def_head">head
</a>.
749 <a id=
"def_hook"></a>hook
753 During the normal execution of several git commands, call-outs are made
754 to optional scripts that allow a developer to add functionality or
755 checking. Typically, the hooks allow for a command to be pre-verified
756 and potentially aborted, and allow for a post-notification after the
757 operation is done. The hook scripts are found in the
758 <tt>$GIT_DIR/hooks/
</tt> directory, and are enabled by simply
759 removing the
<tt>.sample
</tt> suffix from the filename. In earlier versions
760 of git you had to make them executable.
764 <a id=
"def_index"></a>index
768 A collection of files with stat information, whose contents are stored
769 as objects. The index is a stored version of your
770 <a href=
"#def_working_tree">working tree
</a>. Truth be told, it can also contain a second, and even
771 a third version of a working tree, which are used
772 when
<a href=
"#def_merge">merging
</a>.
776 <a id=
"def_index_entry"></a>index entry
780 The information regarding a particular file, stored in the
781 <a href=
"#def_index">index
</a>. An index entry can be unmerged, if a
782 <a href=
"#def_merge">merge
</a> was started, but not yet finished (i.e. if
783 the index contains multiple versions of that file).
787 <a id=
"def_master"></a>master
791 The default development
<a href=
"#def_branch">branch
</a>. Whenever you
792 create a git
<a href=
"#def_repository">repository
</a>, a branch named
793 "master" is created, and becomes the active branch. In most
794 cases, this contains the local development, though that is
795 purely by convention and is not required.
799 <a id=
"def_merge"></a>merge
803 As a verb: To bring the contents of another
804 <a href=
"#def_branch">branch
</a> (possibly from an external
805 <a href=
"#def_repository">repository
</a>) into the current branch. In the
806 case where the merged-in branch is from a different repository,
807 this is done by first
<a href=
"#def_fetch">fetching
</a> the remote branch
808 and then merging the result into the current branch. This
809 combination of fetch and merge operations is called a
810 <a href=
"#def_pull">pull
</a>. Merging is performed by an automatic process
811 that identifies changes made since the branches diverged, and
812 then applies all those changes together. In cases where changes
813 conflict, manual intervention may be required to complete the
816 <div class=
"paragraph"><p>As a noun: unless it is a
<a href=
"#def_fast_forward">fast-forward
</a>, a
817 successful merge results in the creation of a new
<a href=
"#def_commit">commit
</a>
818 representing the result of the merge, and having as
819 <a href=
"#def_parent">parents
</a> the tips of the merged
<a href=
"#def_branch">branches
</a>.
820 This commit is referred to as a
"merge commit", or sometimes just a
824 <a id=
"def_object"></a>object
828 The unit of storage in git. It is uniquely identified by the
829 <a href=
"#def_SHA1">SHA1
</a> of its contents. Consequently, an
830 object can not be changed.
834 <a id=
"def_object_database"></a>object database
838 Stores a set of
"objects", and an individual
<a href=
"#def_object">object
</a> is
839 identified by its
<a href=
"#def_object_name">object name
</a>. The objects usually
840 live in
<tt>$GIT_DIR/objects/
</tt>.
844 <a id=
"def_object_identifier"></a>object identifier
848 Synonym for
<a href=
"#def_object_name">object name
</a>.
852 <a id=
"def_object_name"></a>object name
856 The unique identifier of an
<a href=
"#def_object">object
</a>. The
<a href=
"#def_hash">hash
</a>
857 of the object
’s contents using the Secure Hash Algorithm
858 1 and usually represented by the
40 character hexadecimal encoding of
859 the
<a href=
"#def_hash">hash
</a> of the object.
863 <a id=
"def_object_type"></a>object type
867 One of the identifiers
"<a href="#def_commit_object
">commit</a>",
868 "<a href="#def_tree_object
">tree</a>",
"<a href="#def_tag_object
">tag</a>" or
869 "<a href="#def_blob_object
">blob</a>" describing the type of an
870 <a href=
"#def_object">object
</a>.
874 <a id=
"def_octopus"></a>octopus
878 To
<a href=
"#def_merge">merge
</a> more than two
<a href=
"#def_branch">branches
</a>. Also denotes an
879 intelligent predator.
883 <a id=
"def_origin"></a>origin
887 The default upstream
<a href=
"#def_repository">repository
</a>. Most projects have
888 at least one upstream project which they track. By default
889 <em>origin
</em> is used for that purpose. New upstream updates
890 will be fetched into remote
<a href=
"#def_remote_tracking_branch">remote-tracking branches
</a> named
891 origin/name-of-upstream-branch, which you can see using
892 <tt>git branch -r
</tt>.
896 <a id=
"def_pack"></a>pack
900 A set of objects which have been compressed into one file (to save space
901 or to transmit them efficiently).
905 <a id=
"def_pack_index"></a>pack index
909 The list of identifiers, and other information, of the objects in a
910 <a href=
"#def_pack">pack
</a>, to assist in efficiently accessing the contents of a
915 <a id=
"def_pathspec"></a>pathspec
919 Pattern used to specify paths.
921 <div class=
"paragraph"><p>Pathspecs are used on the command line of
"git ls-files",
"git
922 ls-tree",
"git grep",
"git checkout", and many other commands to
923 limit the scope of operations to some subset of the tree or
924 worktree. See the documentation of each command for whether
925 paths are relative to the current directory or toplevel. The
926 pathspec syntax is as follows:
</p></div>
927 <div class=
"ulist"><ul>
930 any path matches itself
935 the pathspec up to the last slash represents a
936 directory prefix. The scope of that pathspec is
937 limited to that subtree.
942 the rest of the pathspec is a pattern for the remainder
943 of the pathname. Paths relative to the directory
944 prefix will be matched against that pattern using fnmatch(
3);
945 in particular,
<em>*
</em> and
<em>?
</em> <em>can
</em> match directory separators.
947 <div class=
"paragraph"><p>For example, Documentation/*.jpg will match all .jpg files
948 in the Documentation subtree,
949 including Documentation/chapter_1/figure_1.jpg.
</p></div>
954 <a id=
"def_parent"></a>parent
958 A
<a href=
"#def_commit_object">commit object
</a> contains a (possibly empty) list
959 of the logical predecessor(s) in the line of development, i.e. its
964 <a id=
"def_pickaxe"></a>pickaxe
968 The term
<a href=
"#def_pickaxe">pickaxe
</a> refers to an option to the diffcore
969 routines that help select changes that add or delete a given text
970 string. With the
<tt>--pickaxe-all
</tt> option, it can be used to view the full
971 <a href=
"#def_changeset">changeset
</a> that introduced or removed, say, a
972 particular line of text. See
<a href=
"git-diff.html">git-diff(
1)
</a>.
976 <a id=
"def_plumbing"></a>plumbing
980 Cute name for
<a href=
"#def_core_git">core git
</a>.
984 <a id=
"def_porcelain"></a>porcelain
988 Cute name for programs and program suites depending on
989 <a href=
"#def_core_git">core git
</a>, presenting a high level access to
990 core git. Porcelains expose more of a
<a href=
"#def_SCM">SCM
</a>
991 interface than the
<a href=
"#def_plumbing">plumbing
</a>.
995 <a id=
"def_pull"></a>pull
999 Pulling a
<a href=
"#def_branch">branch
</a> means to
<a href=
"#def_fetch">fetch
</a> it and
1000 <a href=
"#def_merge">merge
</a> it. See also
<a href=
"git-pull.html">git-pull(
1)
</a>.
1003 <dt class=
"hdlist1">
1004 <a id=
"def_push"></a>push
1008 Pushing a
<a href=
"#def_branch">branch
</a> means to get the branch
’s
1009 <a href=
"#def_head_ref">head ref
</a> from a remote
<a href=
"#def_repository">repository
</a>,
1010 find out if it is a direct ancestor to the branch
’s local
1011 head ref, and in that case, putting all
1012 objects, which are
<a href=
"#def_reachable">reachable
</a> from the local
1013 head ref, and which are missing from the remote
1014 repository, into the remote
1015 <a href=
"#def_object_database">object database
</a>, and updating the remote
1016 head ref. If the remote
<a href=
"#def_head">head
</a> is not an
1017 ancestor to the local head, the push fails.
1020 <dt class=
"hdlist1">
1021 <a id=
"def_reachable"></a>reachable
1025 All of the ancestors of a given
<a href=
"#def_commit">commit
</a> are said to be
1026 "reachable" from that commit. More
1027 generally, one
<a href=
"#def_object">object
</a> is reachable from
1028 another if we can reach the one from the other by a
<a href=
"#def_chain">chain
</a>
1029 that follows
<a href=
"#def_tag">tags
</a> to whatever they tag,
1030 <a href=
"#def_commit_object">commits
</a> to their parents or trees, and
1031 <a href=
"#def_tree_object">trees
</a> to the trees or
<a href=
"#def_blob_object">blobs
</a>
1035 <dt class=
"hdlist1">
1036 <a id=
"def_rebase"></a>rebase
1040 To reapply a series of changes from a
<a href=
"#def_branch">branch
</a> to a
1041 different base, and reset the
<a href=
"#def_head">head
</a> of that branch
1045 <dt class=
"hdlist1">
1046 <a id=
"def_ref"></a>ref
1050 A
40-byte hex representation of a
<a href=
"#def_SHA1">SHA1
</a> or a name that
1051 denotes a particular
<a href=
"#def_object">object
</a>. These may be stored in
1052 <tt>$GIT_DIR/refs/
</tt>.
1055 <dt class=
"hdlist1">
1056 <a id=
"def_reflog"></a>reflog
1060 A reflog shows the local
"history" of a ref. In other words,
1061 it can tell you what the
3rd last revision in
<em>this
</em> repository
1062 was, and what was the current state in
<em>this
</em> repository,
1063 yesterday
9:
14pm. See
<a href=
"git-reflog.html">git-reflog(
1)
</a> for details.
1066 <dt class=
"hdlist1">
1067 <a id=
"def_refspec"></a>refspec
1071 A
"refspec" is used by
<a href=
"#def_fetch">fetch
</a> and
1072 <a href=
"#def_push">push
</a> to describe the mapping between remote
1073 <a href=
"#def_ref">ref
</a> and local ref. They are combined with a colon in
1074 the format
<src
>:
<dst
>, preceded by an optional plus sign, +.
1075 For example:
<tt>git fetch $URL
1076 refs/heads/master:refs/heads/origin
</tt> means
"grab the master
1077 <a href="#def_branch
">branch</a> <a href="#def_head
">head</a> from the $URL and store
1078 it as my origin branch head". And
<tt>git push
1079 $URL refs/heads/master:refs/heads/to-upstream
</tt> means
"publish my
1080 master branch head as to-upstream branch at $URL". See also
1081 <a href=
"git-push.html">git-push(
1)
</a>.
1084 <dt class=
"hdlist1">
1085 <a id=
"def_remote_tracking_branch"></a>remote-tracking branch
1089 A regular git
<a href=
"#def_branch">branch
</a> that is used to follow changes from
1090 another
<a href=
"#def_repository">repository
</a>. A remote-tracking
1091 branch should not contain direct modifications or have local commits
1092 made to it. A remote-tracking branch can usually be
1093 identified as the right-hand-side
<a href=
"#def_ref">ref
</a> in a Pull:
1094 <a href=
"#def_refspec">refspec
</a>.
1097 <dt class=
"hdlist1">
1098 <a id=
"def_repository"></a>repository
1102 A collection of
<a href=
"#def_ref">refs
</a> together with an
1103 <a href=
"#def_object_database">object database
</a> containing all objects
1104 which are
<a href=
"#def_reachable">reachable
</a> from the refs, possibly
1105 accompanied by meta data from one or more
<a href=
"#def_porcelain">porcelains
</a>. A
1106 repository can share an object database with other repositories
1107 via
<a href=
"#def_alternate_object_database">alternates mechanism
</a>.
1110 <dt class=
"hdlist1">
1111 <a id=
"def_resolve"></a>resolve
1115 The action of fixing up manually what a failed automatic
1116 <a href=
"#def_merge">merge
</a> left behind.
1119 <dt class=
"hdlist1">
1120 <a id=
"def_revision"></a>revision
1124 A particular state of files and directories which was stored in the
1125 <a href=
"#def_object_database">object database
</a>. It is referenced by a
1126 <a href=
"#def_commit_object">commit object
</a>.
1129 <dt class=
"hdlist1">
1130 <a id=
"def_rewind"></a>rewind
1134 To throw away part of the development, i.e. to assign the
1135 <a href=
"#def_head">head
</a> to an earlier
<a href=
"#def_revision">revision
</a>.
1138 <dt class=
"hdlist1">
1139 <a id=
"def_SCM"></a>SCM
1143 Source code management (tool).
1146 <dt class=
"hdlist1">
1147 <a id=
"def_SHA1"></a>SHA1
1151 Synonym for
<a href=
"#def_object_name">object name
</a>.
1154 <dt class=
"hdlist1">
1155 <a id=
"def_shallow_repository"></a>shallow repository
1159 A shallow
<a href=
"#def_repository">repository
</a> has an incomplete
1160 history some of whose
<a href=
"#def_commit">commits
</a> have
<a href=
"#def_parent">parents
</a> cauterized away (in other
1161 words, git is told to pretend that these commits do not have the
1162 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
1163 recent history of a project even though the real history recorded in the
1164 upstream is much larger. A shallow repository
1165 is created by giving the
<tt>--depth
</tt> option to
<a href=
"git-clone.html">git-clone(
1)
</a>, and
1166 its history can be later deepened with
<a href=
"git-fetch.html">git-fetch(
1)
</a>.
1169 <dt class=
"hdlist1">
1170 <a id=
"def_symref"></a>symref
1174 Symbolic reference: instead of containing the
<a href=
"#def_SHA1">SHA1
</a>
1175 id itself, it is of the format
<em>ref: refs/some/thing
</em> and when
1176 referenced, it recursively dereferences to this reference.
1177 <em><a href=
"#def_HEAD">HEAD
</a></em> is a prime example of a symref. Symbolic
1178 references are manipulated with the
<a href=
"git-symbolic-ref.html">git-symbolic-ref(
1)
</a>
1182 <dt class=
"hdlist1">
1183 <a id=
"def_tag"></a>tag
1187 A
<a href=
"#def_ref">ref
</a> pointing to a
<a href=
"#def_tag_object">tag
</a> or
1188 <a href=
"#def_commit_object">commit object
</a>. In contrast to a
<a href=
"#def_head">head
</a>,
1189 a tag is not changed by a
<a href=
"#def_commit">commit
</a>. Tags (not
1190 <a href=
"#def_tag_object">tag objects
</a>) are stored in
<tt>$GIT_DIR/refs/tags/
</tt>. A
1191 git tag has nothing to do with a Lisp tag (which would be
1192 called an
<a href=
"#def_object_type">object type
</a> in git
’s context). A
1193 tag is most typically used to mark a particular point in the
1194 commit ancestry
<a href=
"#def_chain">chain
</a>.
1197 <dt class=
"hdlist1">
1198 <a id=
"def_tag_object"></a>tag object
1202 An
<a href=
"#def_object">object
</a> containing a
<a href=
"#def_ref">ref
</a> pointing to
1203 another object, which can contain a message just like a
1204 <a href=
"#def_commit_object">commit object
</a>. It can also contain a (PGP)
1205 signature, in which case it is called a
"signed tag object".
1208 <dt class=
"hdlist1">
1209 <a id=
"def_topic_branch"></a>topic branch
1213 A regular git
<a href=
"#def_branch">branch
</a> that is used by a developer to
1214 identify a conceptual line of development. Since branches are very easy
1215 and inexpensive, it is often desirable to have several small branches
1216 that each contain very well defined concepts or small incremental yet
1220 <dt class=
"hdlist1">
1221 <a id=
"def_tree"></a>tree
1225 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
1226 (i.e. a stored representation of a working tree).
1229 <dt class=
"hdlist1">
1230 <a id=
"def_tree_object"></a>tree object
1234 An
<a href=
"#def_object">object
</a> containing a list of file names and modes along
1235 with refs to the associated blob and/or tree objects. A
1236 <a href=
"#def_tree">tree
</a> is equivalent to a
<a href=
"#def_directory">directory
</a>.
1239 <dt class=
"hdlist1">
1240 <a id=
"def_tree-ish"></a>tree-ish
1244 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.
1247 <dt class=
"hdlist1">
1248 <a id=
"def_unmerged_index"></a>unmerged index
1252 An
<a href=
"#def_index">index
</a> which contains unmerged
1253 <a href=
"#def_index_entry">index entries
</a>.
1256 <dt class=
"hdlist1">
1257 <a id=
"def_unreachable_object"></a>unreachable object
1261 An
<a href=
"#def_object">object
</a> which is not
<a href=
"#def_reachable">reachable
</a> from a
1262 <a href=
"#def_branch">branch
</a>,
<a href=
"#def_tag">tag
</a>, or any other reference.
1265 <dt class=
"hdlist1">
1266 <a id=
"def_upstream_branch"></a>upstream branch
1270 The default
<a href=
"#def_branch">branch
</a> that is merged into the branch in
1271 question (or the branch in question is rebased onto). It is configured
1272 via branch.
<name
>.remote and branch.
<name
>.merge. If the upstream branch
1273 of
<em>A
</em> is
<em>origin/B
</em> sometimes we say
"<em>A</em> is tracking <em>origin/B</em>".
1276 <dt class=
"hdlist1">
1277 <a id=
"def_working_tree"></a>working tree
1281 The tree of actual checked out files. The working tree normally
1282 contains the contents of the
<a href=
"#def_HEAD">HEAD
</a> commit
’s tree,
1283 plus any local changes that you have made but not yet committed.
1288 <h2 id=
"_see_also">SEE ALSO
</h2>
1289 <div class=
"sectionbody">
1290 <div class=
"paragraph"><p><a href=
"gittutorial.html">gittutorial(
7)
</a>,
1291 <a href=
"gittutorial-2.html">gittutorial-
2(
7)
</a>,
1292 <a href=
"gitcvs-migration.html">gitcvs-migration(
7)
</a>,
1293 <a href=
"everyday.html">Everyday git
</a>,
1294 <a href=
"user-manual.html">The Git User
’s Manual
</a></p></div>
1296 <h2 id=
"_git">GIT
</h2>
1297 <div class=
"sectionbody">
1298 <div class=
"paragraph"><p>Part of the
<a href=
"git.html">git(
1)
</a> suite.
</p></div>
1301 <div id=
"footer-text">
1302 Last updated
2008-
11-
15 08:
07:
36 UTC