summaryrefslogtreecommitdiff
path: root/Documentation/git-apply.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-02-28 22:05:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-02-28 22:05:09 (GMT)
commit325e9bca373349c028a72a796ebcff0732092759 (patch)
tree6ec73dcf010008ed5d2864408d9d5f6bdedfa3d5 /Documentation/git-apply.txt
parente43a6fd3e94888d76779ad79fb568ed180e5fcdf (diff)
parenteb006ccfca019b4e96210310d9f823d050127b22 (diff)
downloadgit-325e9bca373349c028a72a796ebcff0732092759.zip
git-325e9bca373349c028a72a796ebcff0732092759.tar.gz
git-325e9bca373349c028a72a796ebcff0732092759.tar.bz2
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0: added missing backtick in git-apply.txt
Diffstat (limited to 'Documentation/git-apply.txt')
-rw-r--r--Documentation/git-apply.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index e726510..32f2b85 100644
--- a/Documentation/git-apply.txt
+++ b/Documentation/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