@matheusbsbs / matheus-bagliano / commits / 08b2982645
Fork 0

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>

Brad King committed Aug 3, 2010 at 14:41 UTC 08b29826457ed84f02cce3d8e2a2d58e16064751
1 file changed +10
Documentation/git-apply.txt
+10
@@ -26,6 +26,10 @@ with the `--cache` option the patch is only applied to the index.
26 Without these options, the command applies the patch only to files,
27 and does not require them to be in a git repository.
28
29 +This command applies the patch but does not create a commit. Use
30 +linkgit:git-am[1] to create commits from patches generated by
31 +linkgit:git-format-patch[1] and/or received by email.
32 +
33 OPTIONS
34 -------
35 <patch>...::
@@ -242,6 +246,12 @@ If `--index` is not specified, then the submodule commits in the patch
246 are ignored and only the absence or presence of the corresponding
247 subdirectory is checked and (if possible) updated.
248
249 +
250 +SEE ALSO
251 +--------
252 +linkgit:git-am[1].
253 +
254 +
255 Author
256 ------
257 Written by Linus Torvalds <torvalds@osdl.org>