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=-1.7 required=3.0 tests=AWL,BAYES_00, DATE_IN_PAST_12_24,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MALFORMED_FREEMAIL,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=no 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 6EFA41F55B for ; Fri, 29 May 2020 19:13:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727804AbgE2TMa (ORCPT ); Fri, 29 May 2020 15:12:30 -0400 Received: from mout.gmx.net ([212.227.15.15]:43387 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726549AbgE2TMa (ORCPT ); Fri, 29 May 2020 15:12:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1590779538; bh=je7kPO0mIf0lr3eBEWvpaj/tz7IK0ozmbPuZommBCuY=; h=X-UI-Sender-Class:Date:From:To:cc:Subject:In-Reply-To:References; b=AKcs5PBW0cfGY0MWBtBJhe1Au2KyJOAqQgI0NFMbbzXvTMzCMQnKoAog3d8VwFiev e60P/BROJnXVgAetdFYNY38CaMhAWX4JPI89LdVLy+d5gNoQKdVAA1uj7VaEI4o4tY eTw9n3msdQC7DCXobDcJLcjDnoXj9v7fFncQT/d0= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [172.23.211.123] ([89.1.214.207]) by mail.gmx.com (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1N8ofE-1iu51o2Gz0-015uLP; Fri, 29 May 2020 21:12:18 +0200 Date: Fri, 29 May 2020 04:38:37 +0200 (CEST) From: Johannes Schindelin X-X-Sender: virtualbox@gitforwindows.org To: Phillip Wood cc: Junio C Hamano , Elijah Newren , Rohit Ashiwal , =?UTF-8?Q?=C4=90o=C3=A0n_Tr=E1=BA=A7n_C=C3=B4ng_Danh?= , Alban Gruin , Git Mailing List Subject: Re: [PATCH v4 1/5] rebase -i: add --ignore-whitespace flag In-Reply-To: <20200527173356.47364-2-phillip.wood123@gmail.com> Message-ID: References: <20200407141125.30872-1-phillip.wood123@gmail.com> <20200527173356.47364-1-phillip.wood123@gmail.com> <20200527173356.47364-2-phillip.wood123@gmail.com> User-Agent: Alpine 2.21.1 (DEB 209 2017-03-23) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Provags-ID: V03:K1:Bj66EYNNaMIuyvSE4Pp2d8XU/c4yeB+NpkcG/CLe7UlnraKFAfk Zft3mueCQZEh0YdN0zuBlAjhLenQXUl07vq9M+cn8ecsdnGd3TfqJdMdfQ1Dqy3HwFUsxtV KEFN6MTgFMy68v/WPj2z/TrOQMvzQvaIF6XSPFZo9Gr6WFAvrYNuJ5AQ3wjGrnQyk17p6z4 5h5LD1u3yGof/TRAq9IeQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:eQzSrxU+6y0=:CWRuCie1oDcLgcoaaHsHLf GuMlLREq0cq+F38HHf8mqSr7yau81InRlgaTRfDmJOu77cEJa5i/bM2hrTFAKUWF0jNUvnQn4 G5zgdrYAUDfrdQ7TU1DRRxjig1qLX5VrZzQ9egz2pNnlOzbm2HvtB1+CWcR6Em5UQ4CAdP22m 7XkpGFC1XyN1Hz/p1v+1KtOjCJ8ES72V8bijK3i/KN90kiRA/f9lXRDM9QpKlLo2NfkfSFL9y 3usyAgHZUJeOdbyd1wy3eJ43oeyWDoQElUpIMEQdWYt260tyCJdf/myDYOg2QWMEWUFqauoaK jBR00oCwlMPUmjok7vjYKfXDuNZkiYqekB+M0H0H+O7AI200+YlrPf2CuEPzS4lQhWw62gS4k 7EUTqJSQruFKodG6kRBz2jmW4kE4z4f+m7tFr9rZH+cvTBXdpE5sMipcOiPhN2wsPMwhwYdWN mIUwGGRWti3T3Ono5Kgt5eRFFRRiBo3BPnnXAiVBpPLW1EDkpiO/KmegLywHYGQ2gnIf9YBJf cm5ts4IJDCykN2zrZXeVIOFqif7idBrWmG4psdlBY8J2HBECNgjRTWMID2RXfQ03IgDmekmJ3 w9TzwPHtvUvqL4+p52xiV9Jqg7i3kskF5aTJt1tjicZU5VBZZYFkp+jmFiv++5i+Zymrd9y9A FuZFD/g4ELAUxVp+oW7Ip67gjytuLwgZN+mawd7x5FDiMfqw0iwUD4WpLSuYjOnkOJFwQAPoF Ey89kTudpiYdYHJOwCz9E4uEo4VVmLzQZGMuflyR8Qx5JJjptPpjJ3wvcI5qfgoWD5C12QSN5 LiU445wfe2IT4ArTXNPeWhE0gWeVCIrSbVbyPSbreYkiOexEdciCWakldZSP2SL+3hQPtIHHP 5RELln7dO6DiYXcV5qtj0dgVaiECcHUpx0fzPCoRLYZcwRM2SwRmHzi03rgXtmQU1xvtu2jEO 7P5aKGcrhckoLzZlRW8SY2vAlWLTNduZ9frZkVQjsyI3iN+gf/HWnY6gNtQBFHPUWMQR1zP1n PNshBg4E6ECuA4iMEoiy9AdzR+qjEFdIC/M81aqy6b01TnE+SmXqNGdzwZiWafVIgaDGMDEVd GayUdLUc4puzN9Oq2qMRvHHKAer+mbN4t1ufIZYk49MCX3T+prKWFlfxM02YmCGx3wVawflU4 AyS80cNZiwY+p6yeHHQrL97QsV5p/pdd+lRD9l1JiAvlynwmH5wtetEdYRyuaBuk9c7bsTMom GDNE6NsCPYY6a7DGf Content-Transfer-Encoding: quoted-printable Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Hi Phillip, sorry to be _so_ late in the game. (And sorry for sending this to you twice, I managed to skip all the Cc:s due to the Reply-To: header the first time round.) On Wed, 27 May 2020, Phillip Wood wrote: > From: Rohit Ashiwal > > Rebase is implemented with two different backends - 'apply' and 'merge' > each of which support a different set of options. In particuar the apply > backend supports a number of options implemented by 'git am' that are > not available to the merge backend. As part of an on going effort to As a non-native speaker, I am thrown off when reading "available to" instead of the grammatically correct (I believe) "available in". Likewise, "on going" instead of "ongoing" just disrupts my workflow. Maybe these can be fixed? > remove the apply backend this patch adds support for the > --ignore-whitespace option to the merge backend. This option treats > lines with only whitespace changes as unchanged and is implemented in > the merge backend by translating it to -Xignore-space-change. > > Signed-off-by: Rohit Ashiwal > Signed-off-by: Phillip Wood > --- > Documentation/git-rebase.txt | 19 +++++- > builtin/rebase.c | 19 ++++-- > t/t3422-rebase-incompatible-options.sh | 1 - > t/t3436-rebase-more-options.sh | 86 ++++++++++++++++++++++++++ > 4 files changed, 118 insertions(+), 7 deletions(-) > create mode 100755 t/t3436-rebase-more-options.sh > > diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt > index f7a6033607..b003784f01 100644 > --- a/Documentation/git-rebase.txt > +++ b/Documentation/git-rebase.txt > @@ -422,8 +422,23 @@ your branch contains commits which were dropped, th= is option can be used > with `--keep-base` in order to drop those commits from your branch. > > --ignore-whitespace:: > + Ignore whitespace differences when trying to reconcile > +differences. Currently, each backend implements an approximation of > +this behavior: > ++ > +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. > ++ > +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=3D