diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-01-02 10:51:08 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-01-02 10:51:08 +0000 |
| commit | 618bdde17dc39ece4908a6c70d7a57746ddf8c38 (patch) | |
| tree | 67996a1ced6350fe12ea4f0a2b83193f33a924dd /user-manual.txt | |
| parent | 91baf10bd835433b045a39c3b1eb7c6da6b0e053 (diff) | |
| download | git-htmldocs-618bdde17dc39ece4908a6c70d7a57746ddf8c38.tar.gz | |
Autogenerated HTML docs for v1.5.4-rc2-14-geab82
Diffstat (limited to 'user-manual.txt')
| -rw-r--r-- | user-manual.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/user-manual.txt b/user-manual.txt index f2b42068f..3f552e9d8 100644 --- a/user-manual.txt +++ b/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 |