diff options
| author | Elijah Newren <newren@gmail.com> | 2023-10-08 06:45:24 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-09 12:06:44 -0700 |
| commit | 4d542687fcea27c6cce9a79415ad8cb1a817697c (patch) | |
| tree | e72600a6fffb78f19714ea08ea4212cedf0c1258 /Documentation/git-apply.txt | |
| parent | 42bdb80a084f1405f2e57394146c977ad4f3b75a (diff) | |
| download | git-4d542687fcea27c6cce9a79415ad8cb1a817697c.tar.gz | |
documentation: add some commas where they are helpful
Diff best viewed with --color-diff.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-apply.txt')
| -rw-r--r-- | Documentation/git-apply.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index 95bde30870..9cce68a38b 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -23,8 +23,8 @@ DESCRIPTION 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 `--cached` option the patch is only applied to the index. +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. Without these options, the command applies the patch only to files, and does not require them to be in a Git repository. @@ -52,7 +52,7 @@ OPTIONS --summary:: Instead of applying the patch, output a condensed summary of information obtained from git diff extended - headers, such as creations, renames and mode changes. + headers, such as creations, renames, and mode changes. Turns off "apply". --check:: @@ -140,7 +140,7 @@ linkgit:git-config[1]). applying a diff generated with `--unified=0`. To bypass these checks use `--unidiff-zero`. + -Note, for the reasons stated above the usage of context-free patches is +Note, for the reasons stated above, the usage of context-free patches is discouraged. --apply:: @@ -161,7 +161,7 @@ discouraged. --binary:: Historically we did not allow binary patch application without an explicit permission from the user, and this - flag was the way to do so. Currently we always allow binary + flag was the way to do so. Currently, we always allow binary patch application, so this is a no-op. --exclude=<path-pattern>:: |