summaryrefslogtreecommitdiffstats
path: root/git-apply.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2006-06-04 07:24:48 +0000
committerJunio C Hamano <junio@hera.kernel.org>2006-06-04 07:24:48 +0000
commit341071d878757c06a3931db660fe318effc8317e (patch)
tree8cb7bf28351c062adbe71172b942a3228d40725d /git-apply.txt
parentbb8fb05ed082c81af81f9eecf356f993e2ef83b7 (diff)
downloadgit-htmldocs-341071d878757c06a3931db660fe318effc8317e.tar.gz
Autogenerated HTML docs for v1.3.3-g16a4
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 e93ea1f26..9cc7c74de 100644
--- a/git-apply.txt
+++ b/git-apply.txt
@@ -113,7 +113,7 @@ OPTIONS
When `git-apply` is used for statistics and not applying a
patch, it defaults to `nowarn`.
You can use different `<option>` to control this
- behaviour:
+ behavior:
+
* `nowarn` turns off the trailing whitespace warning.
* `warn` outputs warnings for a few such errors, but applies the