From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-4.1 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 7E38F1F531 for ; Mon, 10 Aug 2020 11:04:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726574AbgHJLEg (ORCPT ); Mon, 10 Aug 2020 07:04:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726146AbgHJLEb (ORCPT ); Mon, 10 Aug 2020 07:04:31 -0400 Received: from out1.migadu.com (out1.migadu.com [IPv6:2001:41d0:2:863f::]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D883CC061756 for ; Mon, 10 Aug 2020 04:04:30 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ameretat.dev; s=default; t=1597057468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zo4iWlBKBp3VPXvLfaG34BYI364W2ReIGdl4zt0owuk=; b=XjZgQRYNt7rf5exvY0tmCQFqusV/JuiZjNvRy2a+MeGJB0lPCVnrjrkNjAtp8cN0P0g4D7 rLfMC6iE4R4BonUZnQmhrIfDeDByz1hXG4D4hDnKUYpFI5IYPO8J/6JZDbd9TNUQLqyeTn 0dhRPRRKb7KzK+ZCorRyeFt15VrOD9k= From: "Raymond E. Pasco" To: git@vger.kernel.org Cc: Junio C Hamano , Phillip Wood , "Raymond E. Pasco" Subject: [PATCH] git-apply.txt: correct description of --cached Date: Mon, 10 Aug 2020 07:03:38 -0400 Message-Id: <20200810110338.52203-1-ray@ameretat.dev> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The blurb for "--cached" says it implies "--index", but in reality "--cached" and "--index" are distinct modes with different behavior. Remove the sentence "This implies `--index`." to make the description accurate. Signed-off-by: Raymond E. Pasco --- Documentation/git-apply.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index b9aa39000f..373a9354b5 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -72,7 +72,7 @@ OPTIONS --cached:: Apply a patch without touching the working tree. Instead take the cached data, apply the patch, and store the result in the index - without using the working tree. This implies `--index`. + without using the working tree. --intent-to-add:: When applying the patch only to the working tree, mark new -- 2.28.0.10.gc1c9059842