Skip to content

Commit d16a5da

Browse files
committed
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 lists
2 parents 11f5498 + 4763868 commit d16a5da

File tree

4 files changed

+6
-14
lines changed

4 files changed

+6
-14
lines changed

Documentation/git-clone.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ include::urls.txt[]
187187
Examples
188188
--------
189189

190-
Clone from upstream::
190+
* Clone from upstream:
191191
+
192192
------------
193193
$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6
@@ -196,7 +196,7 @@ $ make
196196
------------
197197

198198

199-
Make a local clone that borrows from the current directory, without checking things out::
199+
* Make a local clone that borrows from the current directory, without checking things out:
200200
+
201201
------------
202202
$ git clone -l -s -n . ../copy
@@ -205,7 +205,7 @@ $ git show-branch
205205
------------
206206

207207

208-
Clone from upstream while borrowing from an existing local directory::
208+
* Clone from upstream while borrowing from an existing local directory:
209209
+
210210
------------
211211
$ git clone --reference my2.6 \
@@ -215,14 +215,14 @@ $ cd my2.7
215215
------------
216216

217217

218-
Create a bare repository to publish your changes to the public::
218+
* Create a bare repository to publish your changes to the public:
219219
+
220220
------------
221221
$ git clone --bare -l /home/proj/.git /pub/scm/proj.git
222222
------------
223223

224224

225-
Create a repository on the kernel.org machine that borrows from Linus::
225+
* Create a repository on the kernel.org machine that borrows from Linus:
226226
+
227227
------------
228228
$ git clone --bare -l -s /pub/scm/.../torvalds/linux-2.6.git \

Documentation/git-reflog.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ depending on the subcommand:
1818
[verse]
1919
'git reflog expire' [--dry-run] [--stale-fix] [--verbose]
2020
[--expire=<time>] [--expire-unreachable=<time>] [--all] <refs>...
21-
+
2221
'git reflog delete' ref@\{specifier\}...
23-
+
2422
'git reflog' ['show'] [log-options] [<ref>]
2523

2624
Reflog is a mechanism to record when the tip of branches are

Documentation/gitdiffcore.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ gitdiffcore(7)
33

44
NAME
55
----
6-
gitdiffcore - Tweaking diff output (June 2005)
6+
gitdiffcore - Tweaking diff output
77

88
SYNOPSIS
99
--------

Documentation/urls.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ GIT URLS[[URLS]]
44
One of the following notations can be used
55
to name the remote repository:
66

7-
===============================================================
87
- rsync://host.xz/path/to/repo.git/
98
- http://host.xz{startsb}:port{endsb}/path/to/repo.git/
109
- https://host.xz{startsb}:port{endsb}/path/to/repo.git/
@@ -14,7 +13,6 @@ to name the remote repository:
1413
- ssh://{startsb}user@{endsb}host.xz/path/to/repo.git/
1514
- ssh://{startsb}user@{endsb}host.xz/~user/path/to/repo.git/
1615
- ssh://{startsb}user@{endsb}host.xz/~/path/to/repo.git
17-
===============================================================
1816

1917
SSH is the default transport protocol over the network. You can
2018
optionally specify which user to log-in as, and an alternate,
@@ -23,18 +21,14 @@ username expansion, as does the native git protocol, but
2321
only the former supports port specification. The following
2422
three are identical to the last three above, respectively:
2523

26-
===============================================================
2724
- {startsb}user@{endsb}host.xz:/path/to/repo.git/
2825
- {startsb}user@{endsb}host.xz:~user/path/to/repo.git/
2926
- {startsb}user@{endsb}host.xz:path/to/repo.git
30-
===============================================================
3127

3228
To sync with a local directory, you can use:
3329

34-
===============================================================
3530
- /path/to/repo.git/
3631
- file:///path/to/repo.git/
37-
===============================================================
3832

3933
ifndef::git-clone[]
4034
They are mostly equivalent, except when cloning. See

0 commit comments

Comments
 (0)