diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-02-28 14:05:09 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-28 14:05:09 -0800 |
| commit | 325e9bca373349c028a72a796ebcff0732092759 (patch) | |
| tree | 6ec73dcf010008ed5d2864408d9d5f6bdedfa3d5 /Documentation | |
| parent | More friendly message when locking the index fails. (diff) | |
| parent | added missing backtick in git-apply.txt (diff) | |
| download | tgif-325e9bca373349c028a72a796ebcff0732092759.tar.xz | |
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0:
added missing backtick in git-apply.txt
Diffstat (limited to 'Documentation')
| -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 e726510ab1..32f2b85a10 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 |