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=-3.7 required=3.0 tests=AWL,BAYES_00, 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 9BAB31F9FD for ; Sat, 6 Mar 2021 06:13:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229881AbhCFGME (ORCPT ); Sat, 6 Mar 2021 01:12:04 -0500 Received: from mail-ed1-f41.google.com ([209.85.208.41]:35626 "EHLO mail-ed1-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229628AbhCFGL7 (ORCPT ); Sat, 6 Mar 2021 01:11:59 -0500 Received: by mail-ed1-f41.google.com with SMTP id p1so5851494edy.2 for ; Fri, 05 Mar 2021 22:11:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=4G8Pt6RIrQcYNFTP9/oNmCez2PRhi/WvvRtRcwZSfXs=; b=j6BNI6TZNSKxKopXoA9aVcEu/lcYDgcAI/bEEazoacW4vtLVpOrRMkGskvtTymQ2Lt CcnCRkAETztF297nwEQSpJpB615+qFdFxfO1NDK6Qo6sNQb2Qzq7Htsl4P1agLHRS0Q4 g77Ygvauo140hw+dxQShz40PGYw4xsAPImfsJfffPW26/0hyYmoF7RXCFT9I4PifgA6B BgK4uB/2LiYYaL+XcJVdGK3TdaMPNpS53MwrKbzS+qeGCFdf2mQf44TJc5SeZpScHWVV AdqI3ud2PP7cl3LVw/TJkCYG/XhLfNXteAOwphiRL7EVVfgTG4nTki0XhjR3u/FPGsX1 WyXQ== X-Gm-Message-State: AOAM531n3jySY6gWNB2umtg8PkkL7OZMPoDb3sUDVtS8ZgyHHUbolVIJ bGWg7qYMNECuUrsn11ZSXgr2gToF2+bmNy6fOVA= X-Google-Smtp-Source: ABdhPJzDK3zEndacaiqoNQTkniHg7LFf+LC0TZ6OFJmXJJ5auAozyws2rgGZxhyNvA3RcQUSMidDlAW3i3nbZ3rI3ss= X-Received: by 2002:aa7:da14:: with SMTP id r20mr478841eds.181.1615011118255; Fri, 05 Mar 2021 22:11:58 -0800 (PST) MIME-Version: 1.0 References: <20210301084512.27170-1-charvi077@gmail.com> <20210301084512.27170-7-charvi077@gmail.com> In-Reply-To: From: Eric Sunshine Date: Sat, 6 Mar 2021 01:11:47 -0500 Message-ID: Subject: Re: [PATCH v3 6/6] doc/git-commit: add documentation for fixup=[amend|reword] options To: Charvi Mendiratta Cc: Junio C Hamano , Git List , Christian Couder , Phillip Wood , Christian Couder , Phillip Wood Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Fri, Mar 5, 2021 at 11:13 PM Charvi Mendiratta wrote: > On Fri, 5 Mar 2021 at 23:55, Junio C Hamano wrote: > > (1) to keep "--fixup=reword:" > > > > (2) to keep "amend!" but not introduce "reword!" insn > > > > (3) document "--fixup=reword:" can be thought of as a mere > > special-case short-hand for "--fixup=amend: --only", > > and > > > > (4) make sure "fixup=amend: --only" is usable as a > > replacement for "--fixup=reword:". > > Okay, I agree that this method is more clear ... This works for me too, especially the bit about improving the documentation to be more clear that --fixup=reword: is a special-case (or syntactic sugar) for --fixup=amend:. My confusion all along was thinking that --fixup=amend: and --fixup=reword: resulted in distinct "amend!" and "reword!" prefixes. I don't know whether that confusion was due to me not reading the commit messages or documentation carefully enough, or because the behavior wasn't clearly documented or easily understood. (I did have to re-read the documentation patch multiple times in an attempt to understand what it was saying, so perhaps I can blame that. ;-) At any rate, it will be good if we can get it clearly documented. > > but if we are not doing (3) and (4), then it would also be OK to > > > > (1) to keep "--fixup=reword:" > > > > (2) to keep "amend!" and introduce "reword!" insn > > ... than this one and will update the patch in the above (former) suggested way. This option would likely be less desirable since it could confuse people into thinking that "reword!" would become "reword" in the sequencer instruction sheet -- which isn't the case at all -- it becomes "fixup -c" (or -C, I can't remember).