summaryrefslogtreecommitdiffstats
path: root/git-apply.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-08-10 05:30:14 +0000
committerJunio C Hamano <junio@kernel.org>2010-08-10 05:30:14 +0000
commite85e36f153c88b736470872f5f9fab52799a28f6 (patch)
tree1218e005a39a1341cb78e3fc724a951dc30a15d3 /git-apply.txt
parenta978876a665cbf17575e06e27f29c77326621c09 (diff)
downloadgit-htmldocs-e85e36f153c88b736470872f5f9fab52799a28f6.tar.gz
Autogenerated HTML docs for v1.7.2.1-66-g0d0ba
Diffstat (limited to 'git-apply.txt')
-rw-r--r--git-apply.txt10
1 files changed, 10 insertions, 0 deletions
diff --git a/git-apply.txt b/git-apply.txt
index 8463439ac..4a74b23d4 100644
--- a/git-apply.txt
+++ b/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>