diff options
Diffstat (limited to 'man1/git-pull.1')
| -rw-r--r-- | man1/git-pull.1 | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/man1/git-pull.1 b/man1/git-pull.1 index 3abf5c012..c5ea9a133 100644 --- a/man1/git-pull.1 +++ b/man1/git-pull.1 @@ -2,12 +2,12 @@ .\" Title: git-pull .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2024-04-05 +.\" Date: 2024-04-09 .\" Manual: Git Manual -.\" Source: Git 2.44.0.501.g19981daefd +.\" Source: Git 2.44.0.548.g91ec36f2cc .\" Language: English .\" -.TH "GIT\-PULL" "1" "2024\-04\-05" "Git 2\&.44\&.0\&.501\&.g19981d" "Git Manual" +.TH "GIT\-PULL" "1" "2024\-04\-09" "Git 2\&.44\&.0\&.548\&.g91ec36" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -714,7 +714,7 @@ The following syntaxes may be used with them: .sp -1 .IP \(bu 2.3 .\} -ssh://[user@]host\&.xz[:port]/path/to/repo\&.git/ +\fBssh://\fR[\fI<user>\fR\fB@\fR]\fI<host>\fR[\fB:\fR\fI<port>\fR]\fB/\fR\fI<path\-to\-git\-repo>\fR .RE .sp .RS 4 @@ -725,7 +725,7 @@ ssh://[user@]host\&.xz[:port]/path/to/repo\&.git/ .sp -1 .IP \(bu 2.3 .\} -git://host\&.xz[:port]/path/to/repo\&.git/ +\fBgit://\fR\fI<host>\fR[:\fI<port>\fR]\fB/\fR\fI<path\-to\-git\-repo>\fR .RE .sp .RS 4 @@ -736,7 +736,7 @@ git://host\&.xz[:port]/path/to/repo\&.git/ .sp -1 .IP \(bu 2.3 .\} -http[s]://host\&.xz[:port]/path/to/repo\&.git/ +\fBhttp\fR[\fBs\fR]\fB://\fR\fI<host>\fR[\fB:\fR\fI<port>\fR]\fB/\fR\fI<path\-to\-git\-repo>\fR .RE .sp .RS 4 @@ -747,7 +747,7 @@ http[s]://host\&.xz[:port]/path/to/repo\&.git/ .sp -1 .IP \(bu 2.3 .\} -ftp[s]://host\&.xz[:port]/path/to/repo\&.git/ +\fBftp\fR[\fBs\fR]\fB://\fR\fI<host>\fR[\fB:\fR\fI<port>\fR]\fB/\fR\fI<path\-to\-git\-repo>\fR .RE .sp An alternative scp\-like syntax may also be used with the ssh protocol: @@ -760,12 +760,12 @@ An alternative scp\-like syntax may also be used with the ssh protocol: .sp -1 .IP \(bu 2.3 .\} -[user@]host\&.xz:path/to/repo\&.git/ +[\fI<user>\fR\fB@\fR]\fI<host>\fR\fB:/\fR\fI<path\-to\-git\-repo>\fR .RE .sp This syntax is only recognized if there are no slashes before the first colon\&. This helps differentiate a local path that contains a colon\&. For example the local path \fBfoo:bar\fR could be specified as an absolute path or \fB\&./foo:bar\fR to avoid being misinterpreted as an ssh url\&. .sp -The ssh and git protocols additionally support ~username expansion: +The ssh and git protocols additionally support \fB~\fR\fI<username>\fR expansion: .sp .RS 4 .ie n \{\ @@ -775,7 +775,7 @@ The ssh and git protocols additionally support ~username expansion: .sp -1 .IP \(bu 2.3 .\} -ssh://[user@]host\&.xz[:port]/~[user]/path/to/repo\&.git/ +\fBssh://\fR[\fI<user>\fR\fB@\fR]\fI<host>\fR[\fB:\fR\fI<port>\fR]\fB/~\fR\fI<user>\fR\fB/\fR\fI<path\-to\-git\-repo>\fR .RE .sp .RS 4 @@ -786,7 +786,7 @@ ssh://[user@]host\&.xz[:port]/~[user]/path/to/repo\&.git/ .sp -1 .IP \(bu 2.3 .\} -git://host\&.xz[:port]/~[user]/path/to/repo\&.git/ +\fBgit://\fR\fI<host>\fR[\fB:\fR\fI<port>\fR]\fB/~\fR\fI<user>\fR\fB/\fR\fI<path\-to\-git\-repo>\fR .RE .sp .RS 4 @@ -797,7 +797,7 @@ git://host\&.xz[:port]/~[user]/path/to/repo\&.git/ .sp -1 .IP \(bu 2.3 .\} -[user@]host\&.xz:/~[user]/path/to/repo\&.git/ +[\fI<user>\fR\fB@\fR]\fI<host>\fR\fB:~\fR\fI<user>\fR\fB/\fR\fI<path\-to\-git\-repo>\fR .RE .sp For local repositories, also supported by Git natively, the following syntaxes may be used: @@ -810,7 +810,7 @@ For local repositories, also supported by Git natively, the following syntaxes m .sp -1 .IP \(bu 2.3 .\} -/path/to/repo\&.git/ +\fB/path/to/repo\&.git/\fR .RE .sp .RS 4 @@ -821,14 +821,14 @@ For local repositories, also supported by Git natively, the following syntaxes m .sp -1 .IP \(bu 2.3 .\} -file:///path/to/repo\&.git/ +\fBfile:///path/to/repo\&.git/\fR .RE .sp These two syntaxes are mostly equivalent, except when cloning, when the former implies \fB\-\-local\fR option\&. See \fBgit-clone\fR(1) for details\&. .sp \fBgit clone\fR, \fBgit fetch\fR and \fBgit pull\fR, but not \fBgit push\fR, will also accept a suitable bundle file\&. See \fBgit-bundle\fR(1)\&. .sp -When Git doesn\(cqt know how to handle a certain transport protocol, it attempts to use the \fBremote\-<transport>\fR remote helper, if one exists\&. To explicitly request a remote helper, the following syntax may be used: +When Git doesn\(cqt know how to handle a certain transport protocol, it attempts to use the \fBremote\-\fR\fI<transport>\fR remote helper, if one exists\&. To explicitly request a remote helper, the following syntax may be used: .sp .RS 4 .ie n \{\ @@ -838,7 +838,7 @@ When Git doesn\(cqt know how to handle a certain transport protocol, it attempts .sp -1 .IP \(bu 2.3 .\} -\fI<transport>\fR::_<address>_ +\fI<transport>\fR::\fI<address>\fR .RE .sp where \fI<address>\fR may be a path, a server and path, or an arbitrary URL\-like string recognized by the specific remote helper being invoked\&. See \fBgitremote-helpers\fR(7) for details\&. @@ -849,8 +849,8 @@ If there are a large number of similarly\-named remote repositories and you want .RS 4 .\} .nf - [url "<actual\-url\-base>"] - insteadOf = <other\-url\-base> + [url "\fI<actual\-url\-base>\fR"] + insteadOf = \fI<other\-url\-base>\fR .fi .if n \{\ .RE @@ -880,8 +880,8 @@ If you want to rewrite URLs for push only, you can create a configuration sectio .RS 4 .\} .nf - [url "<actual\-url\-base>"] - pushInsteadOf = <other\-url\-base> + [url "\fI<actual\-url\-base>\fR"] + pushInsteadOf = \fI<other\-url\-base>\fR .fi .if n \{\ .RE |