diff options
| author | Elijah Newren <newren@gmail.com> | 2023-10-08 06:45:17 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-09 12:06:29 -0700 |
| commit | 0a4f051f9318c3dd9db69c4bebecdc6d160a5fc6 (patch) | |
| tree | 6c5654ff388c603eb020df9d8b4cd7acc2b3b862 /Documentation/git-apply.txt | |
| parent | 3771d002571f6fc796ff3f54e9d5b875826e62ed (diff) | |
| download | git-0a4f051f9318c3dd9db69c4bebecdc6d160a5fc6.tar.gz | |
documentation: add missing article
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index b6e7510d06..95bde30870 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -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 usage of context-free patches is +Note, for the reasons stated above the usage of context-free patches is discouraged. --apply:: @@ -257,7 +257,7 @@ the `--unsafe-paths` option to override this safety check. This option has no effect when `--index` or `--cached` is in use. --allow-empty:: - Don't return error for patches containing no diff. This includes + Don't return an error for patches containing no diff. This includes empty patches and patches with commit text only. CONFIGURATION |