summaryrefslogtreecommitdiff
path: root/Documentation/user-manual.txt
diff options
context:
space:
mode:
authorGustaf Hendeby <hendeby@isy.liu.se>2007-12-31 13:31:35 (GMT)
committerJ. Bruce Fields <bfields@citi.umich.edu>2007-12-31 16:27:15 (GMT)
commit57283291b55cdc4ab726231073450d185beb361a (patch)
treeaf4fcf0b33be45b5a38e5a80f3939323ae114327 /Documentation/user-manual.txt
parentf18b1c55e5b7478524c15685cd643555fc919f3f (diff)
downloadgit-57283291b55cdc4ab726231073450d185beb361a.zip
git-57283291b55cdc4ab726231073450d185beb361a.tar.gz
git-57283291b55cdc4ab726231073450d185beb361a.tar.bz2
Documentation/user-manual.txt: fix typo
Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'Documentation/user-manual.txt')
-rw-r--r--Documentation/user-manual.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 159de30..bee0d61 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -74,7 +74,7 @@ version is called a <<def_commit,commit>>.
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
+parallel lines of development, called <<def_branch,branches>>, which may
merge and diverge.
A single git repository can track development on multiple branches. It