summaryrefslogtreecommitdiff
path: root/Documentation/user-manual.txt
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2007-11-25 18:53:37 (GMT)
committerJ. Bruce Fields <bfields@citi.umich.edu>2007-11-25 19:06:12 (GMT)
commit0c4a33b54f3dbb9fa8cd2f5cf0e2a6363849d899 (patch)
tree8a369d003d8b16f0bcb695216bc6a10a3a43a2d2 /Documentation/user-manual.txt
parent7a3db75beee75c4e1b5fdae7504bc2ba05c58b14 (diff)
downloadgit-0c4a33b54f3dbb9fa8cd2f5cf0e2a6363849d899.zip
git-0c4a33b54f3dbb9fa8cd2f5cf0e2a6363849d899.tar.gz
git-0c4a33b54f3dbb9fa8cd2f5cf0e2a6363849d899.tar.bz2
user-manual: define "branch" and "working tree" at start
Some explanation here might help. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'Documentation/user-manual.txt')
-rw-r--r--Documentation/user-manual.txt18
1 files changed, 12 insertions, 6 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index c027353..8355cce 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -56,11 +56,12 @@ $ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
The initial clone may be time-consuming for a large project, but you
will only need to clone once.
-The clone command creates a new directory named after the project
-("git" or "linux-2.6" in the examples above). After you cd into this
+The clone command creates a new directory named after the project ("git"
+or "linux-2.6" in the examples above). After you cd into this
directory, you will see that it contains a copy of the project files,
-together with a special top-level directory named ".git", which
-contains all the information about the history of the project.
+called the <<def_working_tree,working tree>>, together with a special
+top-level directory named ".git", which contains all the information
+about the history of the project.
[[how-to-check-out]]
How to check out a different version of a project
@@ -71,8 +72,13 @@ of files. It stores the history as a compressed collection of
interrelated snapshots of the project's contents. In git each such
version is called a <<def_commit,commit>>.
-A single git repository may contain multiple branches. It keeps track
-of them by keeping a list of <<def_head,heads>> which reference the
+Those snapshots aren't necessarily all arranged in a single line from
+oldest to newest; instead, work may simultaneously proceed along
+parallel lines of development, called <def_branch,branches>>, which may
+merge and diverge.
+
+A single git repository can track development on multiple branches. It
+does this by keeping a list of <<def_head,heads>> which reference the
latest commit on each branch; the gitlink:git-branch[1] command shows
you the list of branch heads: