diff options
| author | Jim Meyering <jim@meyering.net> | 2012-03-28 10:41:54 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-28 08:47:23 -0700 |
| commit | a7793a749115ead3b8f7447ce1e96572ea5d8ea3 (patch) | |
| tree | b25c8f7aca546e7113e694a23318db546799bd68 /Documentation | |
| parent | 59012e20f8461e51d9f7de1c6ebf05ee7a46b2c2 (diff) | |
| download | git-a7793a749115ead3b8f7447ce1e96572ea5d8ea3.tar.gz git-a7793a749115ead3b8f7447ce1e96572ea5d8ea3.tar.xz | |
correct spelling: an URL -> a URL
Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-submodule.txt | 2 | ||||
| -rw-r--r-- | Documentation/gitmodules.txt | 4 | ||||
| -rw-r--r-- | Documentation/howto/using-merge-subtree.txt | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index b72964947..c243ee552 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -190,7 +190,7 @@ commit for each submodule. sync:: Synchronizes submodules' remote URL configuration setting to the value specified in .gitmodules. It will only affect those - submodules which already have an url entry in .git/config (that is the + submodules which already have a URL entry in .git/config (that is the case when they are initialized or freshly added). This is useful when submodule URLs change upstream and you need to update your local repositories accordingly. diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt index 4040941e5..4e1fd52e7 100644 --- a/Documentation/gitmodules.txt +++ b/Documentation/gitmodules.txt @@ -28,7 +28,7 @@ submodule.<name>.path:: be unique within the .gitmodules file. submodule.<name>.url:: - Defines an url from where the submodule repository can be cloned. + Defines a URL from which the submodule repository can be cloned. This may be either an absolute URL ready to be passed to linkgit:git-clone[1] or (if it begins with ./ or ../) a location relative to the superproject's origin repository. @@ -84,7 +84,7 @@ Consider the following .gitmodules file: This defines two submodules, `libfoo` and `libbar`. These are expected to be checked out in the paths 'include/foo' and 'include/bar', and for both -submodules an url is specified which can be used for cloning the submodules. +submodules a URL is specified which can be used for cloning the submodules. SEE ALSO -------- diff --git a/Documentation/howto/using-merge-subtree.txt b/Documentation/howto/using-merge-subtree.txt index 293305612..1ae8d1214 100644 --- a/Documentation/howto/using-merge-subtree.txt +++ b/Documentation/howto/using-merge-subtree.txt @@ -25,7 +25,7 @@ What you want is the 'subtree' merge strategy, which helps you in such a situation. In this example, let's say you have the repository at `/path/to/B` (but -it can be an URL as well, if you want). You want to merge the 'master' +it can be a URL as well, if you want). You want to merge the 'master' branch of that repository to the `dir-B` subdirectory in your current branch. |