From: Brad King Date: Tue, 3 Aug 2010 18:41:50 +0000 (-0400) Subject: Documentation: cite git-am from git-apply X-Git-Tag: v1.7.2.2~22 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=08b29826457ed84f02cce3d8e2a2d58e16064751;p=git.git Documentation: cite git-am from git-apply Users reading git-apply documentation may also be interested in git-am, especially after receiving an email created with git-format-patch. The documentation for git-am already references git-apply. Add the reverse. Signed-off-by: Brad King Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index 8463439ac..4a74b23d4 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -26,6 +26,10 @@ with the `--cache` 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. +This command applies the patch but does not create a commit. Use +linkgit:git-am[1] to create commits from patches generated by +linkgit:git-format-patch[1] and/or received by email. + OPTIONS ------- ...:: @@ -242,6 +246,12 @@ 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