Skip to content

Commit

Permalink
Documentation: cite git-am from git-apply
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Brad King authored and Junio C Hamano committed Aug 9, 2010
1 parent 3c8710a commit 08b2982
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions Documentation/git-apply.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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>...::
Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit 08b2982

Please sign in to comment.