Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
git
提交
7d61b31b
G
git
项目概览
李少辉-开发者
/
git
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
git
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7d61b31b
编写于
8月 20, 2010
作者:
J
Junio C Hamano
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'vs/doc-spell' into maint
* vs/doc-spell: Documentation: spelling fixes
上级
09c6a8e6
6b677a28
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
18 addition
and
16 deletion
+18
-16
Documentation/config.txt
Documentation/config.txt
+7
-5
Documentation/git-bisect-lk2009.txt
Documentation/git-bisect-lk2009.txt
+1
-1
Documentation/git-commit.txt
Documentation/git-commit.txt
+2
-2
Documentation/git-cvsimport.txt
Documentation/git-cvsimport.txt
+2
-2
Documentation/git-cvsserver.txt
Documentation/git-cvsserver.txt
+2
-2
Documentation/git-hash-object.txt
Documentation/git-hash-object.txt
+1
-1
Documentation/git-reset.txt
Documentation/git-reset.txt
+1
-1
Documentation/gitrepository-layout.txt
Documentation/gitrepository-layout.txt
+1
-1
Documentation/urls.txt
Documentation/urls.txt
+1
-1
未找到文件。
Documentation/config.txt
浏览文件 @
7d61b31b
...
...
@@ -128,7 +128,7 @@ advice.*::
when writing commit messages. Default: true.
commitBeforeMerge::
Advice shown when linkgit:git-merge[1] refuses to
merge to avoid overwrit
t
ing local changes.
merge to avoid overwriting local changes.
Default: true.
resolveConflict::
Advices shown by various commands when conflicts
...
...
@@ -418,7 +418,7 @@ Common unit suffixes of 'k', 'm', or 'g' are supported.
core.deltaBaseCacheLimit::
Maximum number of bytes to reserve for caching base objects
that m
ultiple deltafied objects reference
. By storing the
that m
ay be referenced by multiple deltified objects
. By storing the
entire decompressed base objects in a cache Git is able
to avoid unpacking and decompressing frequently used base
objects multiple times.
...
...
@@ -563,7 +563,7 @@ not necessarily be the current directory.
am.keepcr::
If true, git-am will call git-mailsplit for patches in mbox format
with parameter '--keep-cr'. In this case git-mailsplit will
not remove `\r` from lines ending with `\r\n`. Can be overr
ri
den
not remove `\r` from lines ending with `\r\n`. Can be overr
id
den
by giving '--no-keep-cr' from the command line.
See linkgit:git-am[1], linkgit:git-mailsplit[1].
...
...
@@ -1002,7 +1002,7 @@ gitcvs.usecrlfattr::
If true, the server will look up the end-of-line conversion
attributes for files to determine the '-k' modes to use. If
the attributes force git to treat a file as text,
the '-k' mode will be left blank so
cvs
clients will
the '-k' mode will be left blank so
CVS
clients will
treat it as text. If they suppress text conversion, the file
will be set with '-kb' mode, which suppresses any newline munging
the client might otherwise do. If the attributes do not allow
...
...
@@ -1275,7 +1275,9 @@ instaweb.local::
be bound to the local IP (127.0.0.1).
instaweb.modulepath::
The module path for an apache httpd used by linkgit:git-instaweb[1].
The default module path for linkgit:git-instaweb[1] to use
instead of /usr/lib/apache2/modules. Only used if httpd
is Apache.
instaweb.port::
The port number to bind the gitweb httpd to. See
...
...
Documentation/git-bisect-lk2009.txt
浏览文件 @
7d61b31b
...
...
@@ -971,7 +971,7 @@ logical change in each commit.
The smaller the changes in your commit, the most effective "git
bisect" will be. And you will probably need "git bisect" less in the
first place, as small changes are easier to review even if they are
only reviewed by the commiter.
only reviewed by the commit
t
er.
Another good idea is to have good commit messages. They can be very
helpful to understand why some changes were made.
...
...
Documentation/git-commit.txt
浏览文件 @
7d61b31b
...
...
@@ -130,11 +130,11 @@ OPTIONS
Usually recording a commit that has the exact same tree as its
sole parent commit is a mistake, and the command prevents you
from making such a commit. This option bypasses the safety, and
is primarily for use by foreign
scm
interface scripts.
is primarily for use by foreign
SCM
interface scripts.
--allow-empty-message::
Like --allow-empty this command is primarily for use by foreign
scm
interface scripts. It allows you to create a commit with an
SCM
interface scripts. It allows you to create a commit with an
empty commit message without using plumbing commands like
linkgit:git-commit-tree[1].
...
...
Documentation/git-cvsimport.txt
浏览文件 @
7d61b31b
...
...
@@ -188,7 +188,7 @@ ISSUES
------
Problems related to timestamps:
* If timestamps of commits in the
cvs
repository are not stable enough
* If timestamps of commits in the
CVS
repository are not stable enough
to be used for ordering commits changes may show up in the wrong
order.
* If any files were ever "cvs import"ed more than once (e.g., import of
...
...
@@ -201,7 +201,7 @@ Problems related to branches:
* Branches on which no commits have been made are not imported.
* All files from the branching point are added to a branch even if
never added in
cvs
.
never added in
CVS
.
* This applies to files added to the source branch *after* a daughter
branch was created: if previously no commit was made on the daughter
branch they will erroneously be added to the daughter branch in git.
...
...
Documentation/git-cvsserver.txt
浏览文件 @
7d61b31b
...
...
@@ -366,8 +366,8 @@ CRLF Line Ending Conversions
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
By default the server leaves the '-k' mode blank for all files,
which causes the
cvs
client to treat them as a text files, subject
to
crlf
conversion on some platforms.
which causes the
CVS
client to treat them as a text files, subject
to
end-of-line
conversion on some platforms.
You can make the server use the end-of-line conversion attributes to
set the '-k' modes for files by setting the `gitcvs.usecrlfattr`
...
...
Documentation/git-hash-object.txt
浏览文件 @
7d61b31b
...
...
@@ -49,7 +49,7 @@ OPTIONS
--no-filters::
Hash the contents as is, ignoring any input filter that would
have been chosen by the attributes mechanism, including
crlf
have been chosen by the attributes mechanism, including
the end-of-line
conversion. If the file is read from standard input then this
is always implied, unless the --path option is given.
...
...
Documentation/git-reset.txt
浏览文件 @
7d61b31b
...
...
@@ -256,7 +256,7 @@ Keep changes in working tree while discarding some previous commits::
Suppose you are working on something and you commit it, and then you
continue working a bit more, but now you think that what you have in
your working tree should be in another branch that has nothing to do
with what you commited previously. You can start a new branch and
with what you commit
t
ed previously. You can start a new branch and
reset it while keeping the changes in your work tree.
+
------------
...
...
Documentation/gitrepository-layout.txt
浏览文件 @
7d61b31b
...
...
@@ -16,7 +16,7 @@ You may find these things in your git repository (`.git`
directory for a repository associated with your working tree, or
`<project>.git` directory for a public 'bare' repository. It is
also possible to have a working tree where `.git` is a plain
ascii
file containing `gitdir: <path>`, i.e. the path to the
ASCII
file containing `gitdir: <path>`, i.e. the path to the
real git repository).
objects::
...
...
Documentation/urls.txt
浏览文件 @
7d61b31b
...
...
@@ -25,7 +25,7 @@ The ssh and git protocols additionally support ~username expansion:
- git://host.xz{startsb}:port{endsb}/~{startsb}user{endsb}/path/to/repo.git/
- {startsb}user@{endsb}host.xz:/~{startsb}user{endsb}/path/to/repo.git/
For local re
s
positories, also supported by git natively, the following
For local repositories, also supported by git natively, the following
syntaxes may be used:
- /path/to/repo.git/
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录