diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-31 09:23:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-31 09:23:55 -0800 |
| commit | c477553b2f4f621216b25800e121af52e0750087 (patch) | |
| tree | 9471bdd9502427155e8b184535eb5257abfd5fac /Documentation | |
| parent | ab11903225270be7001b8c92f6ac4e165eaf4ecf (diff) | |
| parent | 57283291b55cdc4ab726231073450d185beb361a (diff) | |
| download | git-c477553b2f4f621216b25800e121af52e0750087.tar.gz git-c477553b2f4f621216b25800e121af52e0750087.tar.xz | |
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')
| -rw-r--r-- | Documentation/config.txt | 2 | ||||
| -rw-r--r-- | Documentation/user-manual.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index ee0884545..e1eaee997 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -757,7 +757,7 @@ remote.<name>.push:: remote.<name>.skipDefaultUpdate:: If true, this remote will be skipped by default when updating - using the remote subcommand of gitlink:git-remote[1]. + using the update subcommand of gitlink:git-remote[1]. remote.<name>.receivepack:: The default program to execute on the remote side when pushing. See diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index f2b42068f..3f552e9d8 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 |