提交 f0acaa6b 编写于 作者: J Junio C Hamano

Merge branch 'nd/apply-doc' into maint

A minor documentation update.

* nd/apply-doc:
  git-apply.txt: mention the behavior inside a subdir
  git-apply.txt: remove a space
...@@ -13,7 +13,7 @@ SYNOPSIS ...@@ -13,7 +13,7 @@ SYNOPSIS
[--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse] [--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]
[--allow-binary-replacement | --binary] [--reject] [-z] [--allow-binary-replacement | --binary] [--reject] [-z]
[-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached] [-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached]
[--ignore-space-change | --ignore-whitespace ] [--ignore-space-change | --ignore-whitespace]
[--whitespace=(nowarn|warn|fix|error|error-all)] [--whitespace=(nowarn|warn|fix|error|error-all)]
[--exclude=<path>] [--include=<path>] [--directory=<root>] [--exclude=<path>] [--include=<path>] [--directory=<root>]
[--verbose] [--unsafe-paths] [<patch>...] [--verbose] [--unsafe-paths] [<patch>...]
...@@ -21,6 +21,8 @@ SYNOPSIS ...@@ -21,6 +21,8 @@ SYNOPSIS
DESCRIPTION DESCRIPTION
----------- -----------
Reads the supplied diff output (i.e. "a patch") and applies it to files. Reads the supplied diff output (i.e. "a patch") and applies it to files.
When running from a subdirectory in a repository, patched paths
outside the directory are ignored.
With the `--index` option the patch is also applied to the index, and With the `--index` option the patch is also applied to the index, and
with the `--cached` option the patch is only applied to the index. with the `--cached` option the patch is only applied to the index.
Without these options, the command applies the patch only to files, Without these options, the command applies the patch only to files,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册