diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-04 15:02:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-04 15:02:45 -0800 |
| commit | 07873dc5dd67398324278ff0d7627bb1a863ba89 (patch) | |
| tree | 6e40258b627f26c729083c1cca9920f89aac637f /Documentation | |
| parent | 6d74e5c9dbe71e2eb63c6e8862ec979e9a5f068b (diff) | |
| parent | 964498e7f90bc5d822746bbf953fb66c6b01ac1c (diff) | |
| download | git-07873dc5dd67398324278ff0d7627bb1a863ba89.tar.gz | |
Merge branch 'maint'
* maint:
Documentation: fix a typo in git-apply.txt
init: remove unnecessary check
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 881652f490..2dcfc097d3 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -22,7 +22,7 @@ DESCRIPTION ----------- Reads the supplied diff output (i.e. "a patch") and applies it to files. With the `--index` option the patch is also applied to the index, and -with the `--cache` option the patch is only applied to the index. +with the `--cached` option the patch is only applied to the index. Without these options, the command applies the patch only to files, and does not require them to be in a git repository. |