X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-apply.txt;h=afd2c9ae59e9145f377d5c702df27bf861c9b2f5;hb=6f61eb201799ee83c3a82f1f097c18b3854c0c03;hp=881652f4904c102104cfe0a0b1de07dbfc32da3f;hpb=2d83abd4b2d12584391cda288a17461a9ae4ba5f;p=git.git diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index 881652f49..afd2c9ae5 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. @@ -246,20 +246,10 @@ If `--index` is not specified, then the submodule commits in the patch are ignored and only the absence or presence of the corresponding subdirectory is checked and (if possible) updated. - SEE ALSO -------- linkgit:git-am[1]. - -Author ------- -Written by Linus Torvalds - -Documentation --------------- -Documentation by Junio C Hamano - GIT --- Part of the linkgit:git[1] suite