From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F11BAC433E7 for ; Fri, 16 Oct 2020 22:12:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8BCFB20678 for ; Fri, 16 Oct 2020 22:12:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=pobox.com header.i=@pobox.com header.b="HW9G+xll" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390035AbgJPWMZ (ORCPT ); Fri, 16 Oct 2020 18:12:25 -0400 Received: from pb-smtp21.pobox.com ([173.228.157.53]:62215 "EHLO pb-smtp21.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390014AbgJPWMZ (ORCPT ); Fri, 16 Oct 2020 18:12:25 -0400 Received: from pb-smtp21.pobox.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 681B0FE9D6; Fri, 16 Oct 2020 18:12:23 -0400 (EDT) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=Qe9BSdqH84SDi3d3aLwOo5qdhh4=; b=HW9G+x llhF4ri/lxYBZK9CraieSw8aR+jyOgRQVKzS7ahFPSxGV9eNkdhZL0k9cmRDWzis P0gtngCJF/tTDowCtMeI/x1WWOqcOv6Yg3+uCD0jBSNcr3by1BqUMHtALRXh0HQB E2keLwBrZ7e77YZDCNirjvCid0wjOei2AtUF4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; q=dns; s=sasl; b=QHSl65nI2dbHa6FnlxF9VGbQGo9O0XWY yGgxV0wXYVG+6+j+jN5hR8kzxNQkG5S1M/bkligwVNq3zw7LneJn0eiZY+EjEGP0 5Kquzc92FJT2RiZuDy1qvV11S7vckIScVbq7Cs5w0fqNUzRvdKk7Ay6A6+SG9lw6 PK+jKLzuQJU= Received: from pb-smtp21.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 61EFCFE9D5; Fri, 16 Oct 2020 18:12:23 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [34.74.119.39]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp21.pobox.com (Postfix) with ESMTPSA id A78B1FE9D4; Fri, 16 Oct 2020 18:12:20 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: Emily Shaffer Cc: git@vger.kernel.org Subject: Re: [PATCH 2/2] docs: demonstrate difference between 'am' and 'apply' References: <20201016205232.2546562-1-emilyshaffer@google.com> <20201016205232.2546562-3-emilyshaffer@google.com> Date: Fri, 16 Oct 2020 15:12:19 -0700 In-Reply-To: (Junio C. Hamano's message of "Fri, 16 Oct 2020 14:53:33 -0700") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: A9084BC8-0FFC-11EB-8329-D609E328BF65-77302942!pb-smtp21.pobox.com Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Junio C Hamano writes: > So, I am moderately against everything under 'use git apply' line of > the patch. However, I do think it is a good idea to add a note > somewhere in the manual of "am" to say something along the lines of > the following (placed around here, or even immediately before we > give the sample patch we used in the above example): > > While an output of "diff format-patch" (see above/below for an > example) is meant to be made into a commit with "git am", > what you have may only be an output of "git diff" without log > message and is not meant to be directly made into a commit. In > such a case, you may want to refer to git-apply[1] to learn how > to apply such a change to your working tree (and optionally to > the index). > > It would be a good idea to redirect those readers who are looking at > "git am" when (perhaps realizing) they should rather be looking at Again, s/realizing/without &/; Sorry for the noise. > "git apply" earlier rather than later, so perhaps taking "see below" > side and giving it as a side-note before the example starts might be > better. Thanks.