зеркало из https://github.com/microsoft/git.git
Sync with Git 1.7.0.3
* maint: Git 1.7.0.3 .mailmap: Map the the first submissions of MJG by e-mail 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
This commit is contained in:
Коммит
4503bd5c37
1
.mailmap
1
.mailmap
|
@ -36,6 +36,7 @@ Li Hong <leehong@pku.edu.cn>
|
|||
Lukas Sandström <lukass@etek.chalmers.se>
|
||||
Martin Langhoff <martin@catalyst.net.nz>
|
||||
Michael Coleman <tutufan@gmail.com>
|
||||
Michael J Gruber <git@drmicha.warpmail.net> <michaeljgruber+gmane@fastmail.fm>
|
||||
Michael W. Olson <mwolson@gnu.org>
|
||||
Michele Ballabio <barra_cuda@katamail.com>
|
||||
Nanako Shiraishi <nanako3@bluebottle.com>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
Git v1.7.0.3 Release Notes (draft)
|
||||
==================================
|
||||
Git v1.7.0.3 Release Notes
|
||||
==========================
|
||||
|
||||
Fixes since v1.7.0.2
|
||||
--------------------
|
||||
|
@ -32,9 +32,3 @@ Fixes since v1.7.0.2
|
|||
matching branch.<name>.remote.
|
||||
|
||||
And other minor fixes and documentation updates.
|
||||
|
||||
--
|
||||
exec >/var/tmp/1
|
||||
echo O=$(git describe)
|
||||
O=v1.7.0.2-69-g730b020
|
||||
git shortlog --no-merges $O..
|
||||
|
|
|
@ -66,5 +66,5 @@ release, unless otherwise noted.
|
|||
---
|
||||
exec >/var/tmp/1
|
||||
echo O=$(git describe)
|
||||
O=v1.7.0.2-322-g4e7d08a
|
||||
O=v1.7.0.2-323-g0d0925c
|
||||
git shortlog --no-merges ^maint $O..
|
||||
|
|
|
@ -187,7 +187,7 @@ include::urls.txt[]
|
|||
Examples
|
||||
--------
|
||||
|
||||
Clone from upstream::
|
||||
* Clone from upstream:
|
||||
+
|
||||
------------
|
||||
$ 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
|
||||
|
@ -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 \
|
||||
|
@ -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
|
||||
------------
|
||||
|
||||
|
||||
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 \
|
||||
|
|
|
@ -18,9 +18,7 @@ depending on the subcommand:
|
|||
[verse]
|
||||
'git reflog expire' [--dry-run] [--stale-fix] [--verbose]
|
||||
[--expire=<time>] [--expire-unreachable=<time>] [--all] <refs>...
|
||||
+
|
||||
'git reflog delete' ref@\{specifier\}...
|
||||
+
|
||||
'git reflog' ['show'] [log-options] [<ref>]
|
||||
|
||||
Reflog is a mechanism to record when the tip of branches are
|
||||
|
|
|
@ -43,9 +43,10 @@ unreleased) version of git, that is available from 'master'
|
|||
branch of the `git.git` repository.
|
||||
Documentation for older releases are available here:
|
||||
|
||||
* link:v1.7.0.2/git.html[documentation for release 1.7.0.2]
|
||||
* link:v1.7.0.3/git.html[documentation for release 1.7.0.3]
|
||||
|
||||
* release notes for
|
||||
link:RelNotes-1.7.0.3.txt[1.7.0.3],
|
||||
link:RelNotes-1.7.0.2.txt[1.7.0.2],
|
||||
link:RelNotes-1.7.0.1.txt[1.7.0.1],
|
||||
link:RelNotes-1.7.0.txt[1.7.0].
|
||||
|
|
|
@ -3,7 +3,7 @@ gitdiffcore(7)
|
|||
|
||||
NAME
|
||||
----
|
||||
gitdiffcore - Tweaking diff output (June 2005)
|
||||
gitdiffcore - Tweaking diff output
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
|
|
|
@ -4,7 +4,6 @@ GIT URLS[[URLS]]
|
|||
One of the following notations can be used
|
||||
to name the remote repository:
|
||||
|
||||
===============================================================
|
||||
- rsync://host.xz/path/to/repo.git/
|
||||
- http://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/~user/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
|
||||
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
|
||||
three are identical to the last three above, respectively:
|
||||
|
||||
===============================================================
|
||||
- {startsb}user@{endsb}host.xz:/path/to/repo.git/
|
||||
- {startsb}user@{endsb}host.xz:~user/path/to/repo.git/
|
||||
- {startsb}user@{endsb}host.xz:path/to/repo.git
|
||||
===============================================================
|
||||
|
||||
To sync with a local directory, you can use:
|
||||
|
||||
===============================================================
|
||||
- /path/to/repo.git/
|
||||
- file:///path/to/repo.git/
|
||||
===============================================================
|
||||
|
||||
ifndef::git-clone[]
|
||||
They are mostly equivalent, except when cloning. See
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/sh
|
||||
|
||||
GVF=GIT-VERSION-FILE
|
||||
DEF_VER=v1.7.0.2
|
||||
DEF_VER=v1.7.0.3
|
||||
|
||||
LF='
|
||||
'
|
||||
|
|
Загрузка…
Ссылка в новой задаче