summaryrefslogtreecommitdiffstats
path: root/git-apply.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2009-03-01 08:02:50 +0000
committerJunio C Hamano <junio@hera.kernel.org>2009-03-01 08:02:50 +0000
commitf8a792291dcb2d2897c8060f4eed60e1db74375a (patch)
tree553ab788211c7eec025630e54137064d3a076b34 /git-apply.txt
parentcfd0b9a8ef679fe7cacae3e130b697ce2dfc7314 (diff)
downloadgit-htmldocs-f8a792291dcb2d2897c8060f4eed60e1db74375a.tar.gz
Autogenerated HTML docs for v1.6.2-rc2-16-gf474c
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 9400f6a5d..05663768d 100644
--- a/git-apply.txt
+++ b/git-apply.txt
@@ -159,7 +159,7 @@ on the command line, and ignored if there is any include pattern.
considered whitespace errors.
+
By default, the command outputs warning messages but applies the patch.
-When `git-apply is used for statistics and not applying a
+When `git-apply` is used for statistics and not applying a
patch, it defaults to `nowarn`.
+
You can use different `<action>` to control this