From mboxrd@z Thu Jan 1 00:00:00 1970 From: Brad King Subject: [PATCH] Documentation: cite git-am from git-apply Date: Tue, 3 Aug 2010 14:41:50 -0400 Message-ID: <1280860910-6867-1-git-send-email-brad.king@kitware.com> Cc: gitster@pobox.com To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Aug 03 20:42:01 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OgMR3-0004as-5A for gcvg-git-2@lo.gmane.org; Tue, 03 Aug 2010 20:41:57 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757524Ab0HCSlw (ORCPT ); Tue, 3 Aug 2010 14:41:52 -0400 Received: from public.kitware.com ([66.194.253.19]:38675 "EHLO public.kitware.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756886Ab0HCSlv (ORCPT ); Tue, 3 Aug 2010 14:41:51 -0400 Received: by public.kitware.com (Postfix, from userid 5001) id BBBC1195D4; Tue, 3 Aug 2010 14:41:50 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on public.kitware.com X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00, FH_DATE_PAST_20XX autolearn=no version=3.2.5 Received: from vesper (vesper.kitwarein.com [192.168.1.207]) by public.kitware.com (Postfix) with ESMTP id 3DA89195D4; Tue, 3 Aug 2010 14:41:50 -0400 (EDT) Received: by vesper (Postfix, from userid 1000) id 37ACF4925; Tue, 3 Aug 2010 14:41:50 -0400 (EDT) X-Mailer: git-send-email 1.7.1 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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 --- Documentation/git-apply.txt | 10 ++++++++++ 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 ------- ...:: @@ -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 -- 1.7.1