doc: uniformize <URL> placeholders' case
URL being an acronym, it deserves to be kept uppercase. Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
a443b762cf
commit
7706294ec9
@ -9,7 +9,7 @@ git-http-fetch - Download from a remote Git repository via HTTP
|
|||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
--------
|
--------
|
||||||
[verse]
|
[verse]
|
||||||
'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <url>
|
'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
-----------
|
-----------
|
||||||
|
@ -9,7 +9,7 @@ git-http-push - Push objects over HTTP/DAV to another repository
|
|||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
--------
|
--------
|
||||||
[verse]
|
[verse]
|
||||||
'git http-push' [--all] [--dry-run] [--force] [--verbose] <url> <ref> [<ref>...]
|
'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <ref> [<ref>...]
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
-----------
|
-----------
|
||||||
|
@ -10,7 +10,7 @@ SYNOPSIS
|
|||||||
--------
|
--------
|
||||||
[verse]
|
[verse]
|
||||||
'git remote' [-v | --verbose]
|
'git remote' [-v | --verbose]
|
||||||
'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>
|
'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <URL>
|
||||||
'git remote rename' <old> <new>
|
'git remote rename' <old> <new>
|
||||||
'git remote remove' <name>
|
'git remote remove' <name>
|
||||||
'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)
|
'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)
|
||||||
@ -18,7 +18,7 @@ SYNOPSIS
|
|||||||
'git remote get-url' [--push] [--all] <name>
|
'git remote get-url' [--push] [--all] <name>
|
||||||
'git remote set-url' [--push] <name> <newurl> [<oldurl>]
|
'git remote set-url' [--push] <name> <newurl> [<oldurl>]
|
||||||
'git remote set-url --add' [--push] <name> <newurl>
|
'git remote set-url --add' [--push] <name> <newurl>
|
||||||
'git remote set-url --delete' [--push] <name> <url>
|
'git remote set-url --delete' [--push] <name> <URL>
|
||||||
'git remote' [-v | --verbose] 'show' [-n] <name>...
|
'git remote' [-v | --verbose] 'show' [-n] <name>...
|
||||||
'git remote prune' [-n | --dry-run] <name>...
|
'git remote prune' [-n | --dry-run] <name>...
|
||||||
'git remote' [-v | --verbose] 'update' [-p | --prune] [(<group> | <remote>)...]
|
'git remote' [-v | --verbose] 'update' [-p | --prune] [(<group> | <remote>)...]
|
||||||
@ -47,7 +47,7 @@ subcommands are available to perform operations on the remotes.
|
|||||||
'add'::
|
'add'::
|
||||||
|
|
||||||
Add a remote named <name> for the repository at
|
Add a remote named <name> for the repository at
|
||||||
<url>. The command `git fetch <name>` can then be used to create and
|
<URL>. The command `git fetch <name>` can then be used to create and
|
||||||
update remote-tracking branches <name>/<branch>.
|
update remote-tracking branches <name>/<branch>.
|
||||||
+
|
+
|
||||||
With `-f` option, `git fetch <name>` is run immediately after
|
With `-f` option, `git fetch <name>` is run immediately after
|
||||||
@ -152,7 +152,7 @@ With `--push`, push URLs are manipulated instead of fetch URLs.
|
|||||||
With `--add`, instead of changing existing URLs, new URL is added.
|
With `--add`, instead of changing existing URLs, new URL is added.
|
||||||
+
|
+
|
||||||
With `--delete`, instead of changing existing URLs, all URLs matching
|
With `--delete`, instead of changing existing URLs, all URLs matching
|
||||||
regex <url> are deleted for remote <name>. Trying to delete all
|
regex <URL> are deleted for remote <name>. Trying to delete all
|
||||||
non-push URLs is an error.
|
non-push URLs is an error.
|
||||||
+
|
+
|
||||||
Note that the push URL and the fetch URL, even though they can
|
Note that the push URL and the fetch URL, even though they can
|
||||||
|
@ -8,7 +8,7 @@ git-request-pull - Generates a summary of pending changes
|
|||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
--------
|
--------
|
||||||
[verse]
|
[verse]
|
||||||
'git request-pull' [-p] <start> <url> [<end>]
|
'git request-pull' [-p] <start> <URL> [<end>]
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
-----------
|
-----------
|
||||||
@ -21,7 +21,7 @@ the changes and indicates from where they can be pulled.
|
|||||||
The upstream project is expected to have the commit named by
|
The upstream project is expected to have the commit named by
|
||||||
`<start>` and the output asks it to integrate the changes you made
|
`<start>` and the output asks it to integrate the changes you made
|
||||||
since that commit, up to the commit named by `<end>`, by visiting
|
since that commit, up to the commit named by `<end>`, by visiting
|
||||||
the repository named by `<url>`.
|
the repository named by `<URL>`.
|
||||||
|
|
||||||
|
|
||||||
OPTIONS
|
OPTIONS
|
||||||
@ -33,14 +33,14 @@ OPTIONS
|
|||||||
Commit to start at. This names a commit that is already in
|
Commit to start at. This names a commit that is already in
|
||||||
the upstream history.
|
the upstream history.
|
||||||
|
|
||||||
<url>::
|
<URL>::
|
||||||
The repository URL to be pulled from.
|
The repository URL to be pulled from.
|
||||||
|
|
||||||
<end>::
|
<end>::
|
||||||
Commit to end at (defaults to HEAD). This names the commit
|
Commit to end at (defaults to HEAD). This names the commit
|
||||||
at the tip of the history you are asking to be pulled.
|
at the tip of the history you are asking to be pulled.
|
||||||
+
|
+
|
||||||
When the repository named by `<url>` has the commit at a tip of a
|
When the repository named by `<URL>` has the commit at a tip of a
|
||||||
ref that is different from the ref you have locally, you can use the
|
ref that is different from the ref you have locally, you can use the
|
||||||
`<local>:<remote>` syntax, to have its local name, a colon `:`, and
|
`<local>:<remote>` syntax, to have its local name, a colon `:`, and
|
||||||
its remote name.
|
its remote name.
|
||||||
|
@ -132,7 +132,7 @@ because the hostnames differ. Nor would it match `foo.example.com`; Git
|
|||||||
compares hostnames exactly, without considering whether two hosts are part of
|
compares hostnames exactly, without considering whether two hosts are part of
|
||||||
the same domain. Likewise, a config entry for `http://example.com` would not
|
the same domain. Likewise, a config entry for `http://example.com` would not
|
||||||
match: Git compares the protocols exactly. However, you may use wildcards in
|
match: Git compares the protocols exactly. However, you may use wildcards in
|
||||||
the domain name and other pattern matching techniques as with the `http.<url>.*`
|
the domain name and other pattern matching techniques as with the `http.<URL>.*`
|
||||||
options.
|
options.
|
||||||
|
|
||||||
If the "pattern" URL does include a path component, then this too must match
|
If the "pattern" URL does include a path component, then this too must match
|
||||||
@ -147,7 +147,7 @@ CONFIGURATION OPTIONS
|
|||||||
|
|
||||||
Options for a credential context can be configured either in
|
Options for a credential context can be configured either in
|
||||||
`credential.*` (which applies to all credentials), or
|
`credential.*` (which applies to all credentials), or
|
||||||
`credential.<url>.*`, where <url> matches the context as described
|
`credential.<URL>.*`, where <URL> matches the context as described
|
||||||
above.
|
above.
|
||||||
|
|
||||||
The following options are available in either location:
|
The following options are available in either location:
|
||||||
|
@ -226,7 +226,7 @@ Workflow for a third party library
|
|||||||
----------------------------------
|
----------------------------------
|
||||||
|
|
||||||
# Add a submodule
|
# Add a submodule
|
||||||
git submodule add <url> <path>
|
git submodule add <URL> <path>
|
||||||
|
|
||||||
# Occasionally update the submodule to a new version:
|
# Occasionally update the submodule to a new version:
|
||||||
git -C <path> checkout <new version>
|
git -C <path> checkout <new version>
|
||||||
|
@ -394,7 +394,7 @@ request to do so by mail. Such a request looks like
|
|||||||
|
|
||||||
-------------------------------------
|
-------------------------------------
|
||||||
Please pull from
|
Please pull from
|
||||||
<url> <branch>
|
<URL> <branch>
|
||||||
-------------------------------------
|
-------------------------------------
|
||||||
|
|
||||||
In that case, 'git pull' can do the fetch and merge in one go, as
|
In that case, 'git pull' can do the fetch and merge in one go, as
|
||||||
@ -403,7 +403,7 @@ follows.
|
|||||||
.Push/pull: Merging remote topics
|
.Push/pull: Merging remote topics
|
||||||
[caption="Recipe: "]
|
[caption="Recipe: "]
|
||||||
=====================================
|
=====================================
|
||||||
`git pull <url> <branch>`
|
`git pull <URL> <branch>`
|
||||||
=====================================
|
=====================================
|
||||||
|
|
||||||
Occasionally, the maintainer may get merge conflicts when they try to
|
Occasionally, the maintainer may get merge conflicts when they try to
|
||||||
@ -440,7 +440,7 @@ merge because you cannot format-patch merges):
|
|||||||
.format-patch/am: Keeping topics up to date
|
.format-patch/am: Keeping topics up to date
|
||||||
[caption="Recipe: "]
|
[caption="Recipe: "]
|
||||||
=====================================
|
=====================================
|
||||||
`git pull --rebase <url> <branch>`
|
`git pull --rebase <URL> <branch>`
|
||||||
=====================================
|
=====================================
|
||||||
|
|
||||||
You can then fix the conflicts during the rebase. Presumably you have
|
You can then fix the conflicts during the rebase. Presumably you have
|
||||||
|
@ -26,14 +26,14 @@ config file would appear like this:
|
|||||||
|
|
||||||
------------
|
------------
|
||||||
[remote "<name>"]
|
[remote "<name>"]
|
||||||
url = <url>
|
url = <URL>
|
||||||
pushurl = <pushurl>
|
pushurl = <pushurl>
|
||||||
push = <refspec>
|
push = <refspec>
|
||||||
fetch = <refspec>
|
fetch = <refspec>
|
||||||
------------
|
------------
|
||||||
|
|
||||||
The `<pushurl>` is used for pushes only. It is optional and defaults
|
The `<pushurl>` is used for pushes only. It is optional and defaults
|
||||||
to `<url>`.
|
to `<URL>`.
|
||||||
|
|
||||||
Named file in `$GIT_DIR/remotes`
|
Named file in `$GIT_DIR/remotes`
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
@ -67,10 +67,10 @@ This file should have the following format:
|
|||||||
|
|
||||||
|
|
||||||
------------
|
------------
|
||||||
<url>#<head>
|
<URL>#<head>
|
||||||
------------
|
------------
|
||||||
|
|
||||||
`<url>` is required; `#<head>` is optional.
|
`<URL>` is required; `#<head>` is optional.
|
||||||
|
|
||||||
Depending on the operation, git will use one of the following
|
Depending on the operation, git will use one of the following
|
||||||
refspecs, if you don't provide one on the command line.
|
refspecs, if you don't provide one on the command line.
|
||||||
|
Loading…
Reference in New Issue
Block a user