diff options
Diffstat (limited to 'git-apply.txt')
| -rw-r--r-- | git-apply.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-apply.txt b/git-apply.txt index 1d478cbe9..5e16e6db7 100644 --- a/git-apply.txt +++ b/git-apply.txt @@ -208,7 +208,7 @@ behavior: * `warn` outputs warnings for a few such errors, but applies the patch as-is (default). * `fix` outputs warnings for a few such errors, and applies the - patch after fixing them (`strip` is a synonym --- the tool + patch after fixing them (`strip` is a synonym -- the tool used to consider only trailing whitespace characters as errors, and the fix involved 'stripping' them, but modern Gits do more). * `error` outputs warnings for a few such errors, and refuses |