Merge branch 'maint-1.6.6' into maint
* maint-1.6.6: Documentation/git-clone: Transform description list into item list Documentation/urls: Remove spurious example markers Documentation/gitdiffcore: Remove misleading date in heading Documentation/git-reflog: Fix formatting of command listsmaint
commit
d16a5dafdc
|
@ -187,7 +187,7 @@ include::urls.txt[]
|
||||||
Examples
|
Examples
|
||||||
--------
|
--------
|
||||||
|
|
||||||
Clone from upstream::
|
* Clone from upstream:
|
||||||
+
|
+
|
||||||
------------
|
------------
|
||||||
$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6
|
$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6
|
||||||
|
@ -196,7 +196,7 @@ $ make
|
||||||
------------
|
------------
|
||||||
|
|
||||||
|
|
||||||
Make a local clone that borrows from the current directory, without checking things out::
|
* Make a local clone that borrows from the current directory, without checking things out:
|
||||||
+
|
+
|
||||||
------------
|
------------
|
||||||
$ git clone -l -s -n . ../copy
|
$ git clone -l -s -n . ../copy
|
||||||
|
@ -205,7 +205,7 @@ $ git show-branch
|
||||||
------------
|
------------
|
||||||
|
|
||||||
|
|
||||||
Clone from upstream while borrowing from an existing local directory::
|
* Clone from upstream while borrowing from an existing local directory:
|
||||||
+
|
+
|
||||||
------------
|
------------
|
||||||
$ git clone --reference my2.6 \
|
$ git clone --reference my2.6 \
|
||||||
|
@ -215,14 +215,14 @@ $ cd my2.7
|
||||||
------------
|
------------
|
||||||
|
|
||||||
|
|
||||||
Create a bare repository to publish your changes to the public::
|
* Create a bare repository to publish your changes to the public:
|
||||||
+
|
+
|
||||||
------------
|
------------
|
||||||
$ git clone --bare -l /home/proj/.git /pub/scm/proj.git
|
$ git clone --bare -l /home/proj/.git /pub/scm/proj.git
|
||||||
------------
|
------------
|
||||||
|
|
||||||
|
|
||||||
Create a repository on the kernel.org machine that borrows from Linus::
|
* Create a repository on the kernel.org machine that borrows from Linus:
|
||||||
+
|
+
|
||||||
------------
|
------------
|
||||||
$ git clone --bare -l -s /pub/scm/.../torvalds/linux-2.6.git \
|
$ git clone --bare -l -s /pub/scm/.../torvalds/linux-2.6.git \
|
||||||
|
|
|
@ -18,9 +18,7 @@ depending on the subcommand:
|
||||||
[verse]
|
[verse]
|
||||||
'git reflog expire' [--dry-run] [--stale-fix] [--verbose]
|
'git reflog expire' [--dry-run] [--stale-fix] [--verbose]
|
||||||
[--expire=<time>] [--expire-unreachable=<time>] [--all] <refs>...
|
[--expire=<time>] [--expire-unreachable=<time>] [--all] <refs>...
|
||||||
+
|
|
||||||
'git reflog delete' ref@\{specifier\}...
|
'git reflog delete' ref@\{specifier\}...
|
||||||
+
|
|
||||||
'git reflog' ['show'] [log-options] [<ref>]
|
'git reflog' ['show'] [log-options] [<ref>]
|
||||||
|
|
||||||
Reflog is a mechanism to record when the tip of branches are
|
Reflog is a mechanism to record when the tip of branches are
|
||||||
|
|
|
@ -3,7 +3,7 @@ gitdiffcore(7)
|
||||||
|
|
||||||
NAME
|
NAME
|
||||||
----
|
----
|
||||||
gitdiffcore - Tweaking diff output (June 2005)
|
gitdiffcore - Tweaking diff output
|
||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
--------
|
--------
|
||||||
|
|
|
@ -4,7 +4,6 @@ GIT URLS[[URLS]]
|
||||||
One of the following notations can be used
|
One of the following notations can be used
|
||||||
to name the remote repository:
|
to name the remote repository:
|
||||||
|
|
||||||
===============================================================
|
|
||||||
- rsync://host.xz/path/to/repo.git/
|
- rsync://host.xz/path/to/repo.git/
|
||||||
- http://host.xz{startsb}:port{endsb}/path/to/repo.git/
|
- http://host.xz{startsb}:port{endsb}/path/to/repo.git/
|
||||||
- https://host.xz{startsb}:port{endsb}/path/to/repo.git/
|
- https://host.xz{startsb}:port{endsb}/path/to/repo.git/
|
||||||
|
@ -14,7 +13,6 @@ to name the remote repository:
|
||||||
- ssh://{startsb}user@{endsb}host.xz/path/to/repo.git/
|
- ssh://{startsb}user@{endsb}host.xz/path/to/repo.git/
|
||||||
- ssh://{startsb}user@{endsb}host.xz/~user/path/to/repo.git/
|
- ssh://{startsb}user@{endsb}host.xz/~user/path/to/repo.git/
|
||||||
- ssh://{startsb}user@{endsb}host.xz/~/path/to/repo.git
|
- ssh://{startsb}user@{endsb}host.xz/~/path/to/repo.git
|
||||||
===============================================================
|
|
||||||
|
|
||||||
SSH is the default transport protocol over the network. You can
|
SSH is the default transport protocol over the network. You can
|
||||||
optionally specify which user to log-in as, and an alternate,
|
optionally specify which user to log-in as, and an alternate,
|
||||||
|
@ -23,18 +21,14 @@ username expansion, as does the native git protocol, but
|
||||||
only the former supports port specification. The following
|
only the former supports port specification. The following
|
||||||
three are identical to the last three above, respectively:
|
three are identical to the last three above, respectively:
|
||||||
|
|
||||||
===============================================================
|
|
||||||
- {startsb}user@{endsb}host.xz:/path/to/repo.git/
|
- {startsb}user@{endsb}host.xz:/path/to/repo.git/
|
||||||
- {startsb}user@{endsb}host.xz:~user/path/to/repo.git/
|
- {startsb}user@{endsb}host.xz:~user/path/to/repo.git/
|
||||||
- {startsb}user@{endsb}host.xz:path/to/repo.git
|
- {startsb}user@{endsb}host.xz:path/to/repo.git
|
||||||
===============================================================
|
|
||||||
|
|
||||||
To sync with a local directory, you can use:
|
To sync with a local directory, you can use:
|
||||||
|
|
||||||
===============================================================
|
|
||||||
- /path/to/repo.git/
|
- /path/to/repo.git/
|
||||||
- file:///path/to/repo.git/
|
- file:///path/to/repo.git/
|
||||||
===============================================================
|
|
||||||
|
|
||||||
ifndef::git-clone[]
|
ifndef::git-clone[]
|
||||||
They are mostly equivalent, except when cloning. See
|
They are mostly equivalent, except when cloning. See
|
||||||
|
|
Loading…
Reference in New Issue