diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-02-28 14:39:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-28 14:39:56 -0800 |
| commit | 12ef3d84393025af044869be7de4c8e8aa1e025f (patch) | |
| tree | b449bafb9b162a4f8045dffaea71f28518cc2c4b /Documentation/git-apply.txt | |
| parent | 749485f6225455eefd4a2af31e2c98068f20464d (diff) | |
| parent | dcc901bc2926f92558a854430570123b4152451d (diff) | |
| download | git-12ef3d84393025af044869be7de4c8e8aa1e025f.tar.gz | |
Merge branch 'maint'
* maint:
Documentation: minor grammatical fixes.
added missing backtick in git-apply.txt
Diffstat (limited to 'Documentation/git-apply.txt')
| -rw-r--r-- | Documentation/git-apply.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index 9400f6a5d0..05663768d7 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 |