summaryrefslogtreecommitdiff
path: root/Documentation/git-apply.txt
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2010-08-03 18:41:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-09 16:15:41 (GMT)
commit08b29826457ed84f02cce3d8e2a2d58e16064751 (patch)
tree7993395ca0b6a727e988ce2e4fae962837ab9f27 /Documentation/git-apply.txt
parent3c8710aeaa81a70ecad9facfc332d843ee37de35 (diff)
downloadgit-08b29826457ed84f02cce3d8e2a2d58e16064751.zip
git-08b29826457ed84f02cce3d8e2a2d58e16064751.tar.gz
git-08b29826457ed84f02cce3d8e2a2d58e16064751.tar.bz2
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 <brad.king@kitware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-apply.txt')
-rw-r--r--Documentation/git-apply.txt10
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index 8463439..4a74b23 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
-------
<patch>...::
@@ -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 <torvalds@osdl.org>