summaryrefslogtreecommitdiff
path: root/Documentation/user-manual.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-12-31 17:23:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-12-31 17:23:55 (GMT)
commitc477553b2f4f621216b25800e121af52e0750087 (patch)
tree9471bdd9502427155e8b184535eb5257abfd5fac /Documentation/user-manual.txt
parentab11903225270be7001b8c92f6ac4e165eaf4ecf (diff)
parent57283291b55cdc4ab726231073450d185beb361a (diff)
downloadgit-c477553b2f4f621216b25800e121af52e0750087.zip
git-c477553b2f4f621216b25800e121af52e0750087.tar.gz
git-c477553b2f4f621216b25800e121af52e0750087.tar.bz2
Merge branch 'maint' of git://linux-nfs.org/~bfields/git
* 'maint' of git://linux-nfs.org/~bfields/git: Documentation/user-manual.txt: fix typo Documentation: fix remote.<name>.skipDefaultUpdate description
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 f2b4206..3f552e9 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