Skip to content

Commit efe778c

Browse files
committed
Merge branch 'nd/apply-doc'
A minor documentation update. * nd/apply-doc: git-apply.txt: mention the behavior inside a subdir git-apply.txt: remove a space
2 parents d04aa7e + 16a86d4 commit efe778c

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

Documentation/git-apply.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,16 @@ SYNOPSIS
1313
[--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]
1414
[--allow-binary-replacement | --binary] [--reject] [-z]
1515
[-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached]
16-
[--ignore-space-change | --ignore-whitespace ]
16+
[--ignore-space-change | --ignore-whitespace]
1717
[--whitespace=(nowarn|warn|fix|error|error-all)]
1818
[--exclude=<path>] [--include=<path>] [--directory=<root>]
1919
[--verbose] [--unsafe-paths] [<patch>...]
2020

2121
DESCRIPTION
2222
-----------
2323
Reads the supplied diff output (i.e. "a patch") and applies it to files.
24+
When running from a subdirectory in a repository, patched paths
25+
outside the directory are ignored.
2426
With the `--index` option the patch is also applied to the index, and
2527
with the `--cached` option the patch is only applied to the index.
2628
Without these options, the command applies the patch only to files,

0 commit comments

Comments
 (0)