diff options
| author | Gustaf Hendeby <hendeby@isy.liu.se> | 2007-12-31 14:31:35 +0100 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2007-12-31 11:27:15 -0500 |
| commit | 57283291b55cdc4ab726231073450d185beb361a (patch) | |
| tree | af4fcf0b33be45b5a38e5a80f3939323ae114327 /Documentation/user-manual.txt | |
| parent | f18b1c55e5b7478524c15685cd643555fc919f3f (diff) | |
| download | git-57283291b55cdc4ab726231073450d185beb361a.tar.gz | |
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.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 159de30e19..bee0d61ab7 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 |