development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 11:39:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Documentation: cite git-am from git-apply

Browse source 
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>
This commit is contained in:
Brad King 2010-08-03 14:41:50 -04:00 committed by Junio C Hamano
parent 3c8710aeaa
commit 08b2982645
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Documentation/git-apply.txt
View file

@ -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, Without these options, the command applies the patch only to files,
and does not require them to be in a git repository. 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 OPTIONS
------- -------
<patch>...:: <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 are ignored and only the absence or presence of the corresponding
subdirectory is checked and (if possible) updated. subdirectory is checked and (if possible) updated.
SEE ALSO
--------
linkgit:git-am[1].
Author Author
------ ------
Written by Linus Torvalds <torvalds@osdl.org> Written by Linus Torvalds <torvalds@osdl.org>