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-ASN: AS3215 2.6.0.0/16 X-Spam-Status: No, score=-0.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id 402A91F727 for ; Tue, 28 Jun 2022 21:55:26 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (1024-bit key; unprotected) header.d=pobox.com header.i=@pobox.com header.b="puhupnPl"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229880AbiF1Vtq (ORCPT ); Tue, 28 Jun 2022 17:49:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52384 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229616AbiF1Vtp (ORCPT ); Tue, 28 Jun 2022 17:49:45 -0400 Received: from pb-smtp20.pobox.com (pb-smtp20.pobox.com [173.228.157.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E55DD1EC72 for ; Tue, 28 Jun 2022 14:49:43 -0700 (PDT) Received: from pb-smtp20.pobox.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 4D7521988FA; Tue, 28 Jun 2022 17:49:43 -0400 (EDT) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=j9aq8jOMbYN5aEhBGoOk1p5dFB4kFkGpTTxWKn ToKFE=; b=puhupnPlvqskwprjA9Ce/cu594a3yxBcoLxXqwFhGhZAttH7hSeiPF b9NxmxT1KLTqM4JH9FSePQOuiKedUQKoGpbabizYPHi8pEfmSLWV6Y9Am54+h7ZP wsT9sK4KraLHdHWJuCcfEmXOQszptNriJGv1r8aUzr6hy2IVzv9tc= Received: from pb-smtp20.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 452361988F9; Tue, 28 Jun 2022 17:49:43 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [34.82.80.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp20.pobox.com (Postfix) with ESMTPSA id DC6931988F7; Tue, 28 Jun 2022 17:49:39 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: "Derrick Stolee via GitGitGadget" Cc: git@vger.kernel.org, me@ttaylorr.com, Johannes.Schindelin@gmx.de, Phillip Wood , =?utf-8?B?w4Z2YXIgQXJuZmo=?= =?utf-8?B?w7Zyw7A=?= Bjarmason , Derrick Stolee Subject: Re: [PATCH v2] git-rebase.txt: use back-ticks consistently References: Date: Tue, 28 Jun 2022 14:49:38 -0700 In-Reply-To: (Derrick Stolee via GitGitGadget's message of "Tue, 28 Jun 2022 20:02:57 +0000") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: 360E58EC-F72C-11EC-B5F9-C85A9F429DF0-77302942!pb-smtp20.pobox.com Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org "Derrick Stolee via GitGitGadget" writes: > -apply backend: When applying a patch, ignore changes in whitespace in > -context lines. Unfortunately, this means that if the "old" lines being > -replaced by the patch differ only in whitespace from the existing > -file, you will get a merge conflict instead of a successful patch > -application. > +apply backend:;; Hmph, I am surprised that you took this, with an extra colon. Does it format nicely? > + When applying a patch, ignore changes in whitespace in context > + lines. Unfortunately, this means that if the "old" lines being > + replaced by the patch differ only in whitespace from the existing > + file, you will get a merge conflict instead of a successful patch > + application. > + > -merge backend: Treat lines with only whitespace changes as unchanged > -when merging. Unfortunately, this means that any patch hunks that were > -intended to modify whitespace and nothing else will be dropped, even > -if the other side had no changes that conflicted. > +merge backend:;; > + Treat lines with only whitespace changes as unchanged when merging. > + Unfortunately, this means that any patch hunks that were intended > + to modify whitespace and nothing else will be dropped, even if the > + other side had no changes that conflicted. > > --whitespace=