user-manual: define "branch" and "working tree" at start
Some explanation here might help. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
J. Bruce Fields committed
Nov 25, 2007 at 13:53 UTC
0c4a33b54f3dbb9fa8cd2f5cf0e2a6363849d899
1 file changed
+12
-6
Documentation/user-manual.txt
+12
-6
@@ -56,11 +56,12 @@ $ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
56
The initial clone may be time-consuming for a large project, but you
57
will only need to clone once.
58
59
-The clone command creates a new directory named after the project
60
-("git" or "linux-2.6" in the examples above). After you cd into this
59
+The clone command creates a new directory named after the project ("git"
60
+or "linux-2.6" in the examples above). After you cd into this
61
directory, you will see that it contains a copy of the project files,
62
-together with a special top-level directory named ".git", which
63
-contains all the information about the history of the project.
62
+called the <<def_working_tree,working tree>>, together with a special
63
+top-level directory named ".git", which contains all the information
64
+about the history of the project.
65
66
[[how-to-check-out]]
67
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
72
interrelated snapshots of the project's contents. In git each such
73
version is called a <<def_commit,commit>>.
74
74
-A single git repository may contain multiple branches. It keeps track
75
-of them by keeping a list of <<def_head,heads>> which reference the
75
+Those snapshots aren't necessarily all arranged in a single line from
76
+oldest to newest; instead, work may simultaneously proceed along
77
+parallel lines of development, called <def_branch,branches>>, which may
78
+merge and diverge.
79
+
80
+A single git repository can track development on multiple branches. It
81
+does this by keeping a list of <<def_head,heads>> which reference the
82
latest commit on each branch; the gitlink:git-branch[1] command shows
83
you the list of branch heads:
84