Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
correct spelling: an URL -> a URL
Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jim Meyering authored and Junio C Hamano committed Mar 28, 2012
1 parent 59012e2 commit a7793a7
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Documentation/git-submodule.txt
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions Documentation/gitmodules.txt
Expand Up @@ -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.
Expand Down Expand Up @@ -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
--------
Expand Down
2 changes: 1 addition & 1 deletion Documentation/howto/using-merge-subtree.txt
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion contrib/svn-fe/svn-fe.txt
Expand Up @@ -51,7 +51,7 @@ as committer, where 'user' is the value of the `svn:author` property
and 'UUID' the repository's identifier.

To support incremental imports, 'svn-fe' puts a `git-svn-id` line at
the end of each commit log message if passed an url on the command
the end of each commit log message if passed a URL on the command
line. This line has the form `git-svn-id: URL@REVNO UUID`.

The resulting repository will generally require further processing
Expand Down
2 changes: 1 addition & 1 deletion http.c
Expand Up @@ -829,7 +829,7 @@ int http_get_strbuf(const char *url, struct strbuf *result, int options)
}

/*
* Downloads an url and stores the result in the given file.
* Downloads a URL and stores the result in the given file.
*
* If a previous interrupted download is detected (i.e. a previous temporary
* file is still around) the download is resumed.
Expand Down
2 changes: 1 addition & 1 deletion http.h
Expand Up @@ -127,7 +127,7 @@ extern char *get_remote_object_url(const char *url, const char *hex,
#define HTTP_NOAUTH 5

/*
* Requests an url and stores the result in a strbuf.
* Requests a URL and stores the result in a strbuf.
*
* If the result pointer is NULL, a HTTP HEAD request is made instead of GET.
*/
Expand Down
2 changes: 1 addition & 1 deletion perl/Git.pm
Expand Up @@ -691,7 +691,7 @@ The hash is in the format C<refname =\> hash>. For tags, the C<refname> entry
contains the tag object while a C<refname^{}> entry gives the tagged objects.
C<REPOSITORY> has the same meaning as the appropriate C<git-ls-remote>
argument; either an URL or a remote name (if called on a repository instance).
argument; either a URL or a remote name (if called on a repository instance).
C<GROUPS> is an optional arrayref that can contain 'tags' to return all the
tags and/or 'heads' to return all the heads. C<REFGLOB> is an optional array
of strings containing a shell-like glob to further limit the refs returned in
Expand Down
2 changes: 1 addition & 1 deletion transport.c
Expand Up @@ -1154,7 +1154,7 @@ int transport_disconnect(struct transport *transport)
}

/*
* Strip username (and password) from an url and return
* Strip username (and password) from a URL and return
* it in a newly allocated string.
*/
char *transport_anonymize_url(const char *url)
Expand Down

0 comments on commit a7793a7

Please sign in to comment.