summaryrefslogtreecommitdiffstats
path: root/git-apply.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-01-30 14:48:08 -0800
committerJunio C Hamano <gitster@pobox.com>2023-01-30 14:48:08 -0800
commit11f1df190fcc3ac9c3263a3eba8104cbdee4787d (patch)
treed502d6143db9bbb16ca8afac629ff1b4126c9482 /git-apply.txt
parentd71eb7dd5b4fb3cafaa3d603f625c0a0f75373f4 (diff)
downloadgit-htmldocs-11f1df190fcc3ac9c3263a3eba8104cbdee4787d.tar.gz
Autogenerated HTML docs for v2.39.1-388-g2fc9e
Diffstat (limited to 'git-apply.txt')
-rw-r--r--git-apply.txt2
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