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
This commit is contained in:
commit
f0acaa6b1c
@ -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,
|
||||||
|
Loading…
Reference in New Issue
Block a user