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=-7.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS 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 99D8EC4338F for ; Wed, 11 Aug 2021 07:24:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 798A061008 for ; Wed, 11 Aug 2021 07:24:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235109AbhHKHZC (ORCPT ); Wed, 11 Aug 2021 03:25:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235506AbhHKHZB (ORCPT ); Wed, 11 Aug 2021 03:25:01 -0400 Received: from mail-oi1-x233.google.com (mail-oi1-x233.google.com [IPv6:2607:f8b0:4864:20::233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DB56DC061765 for ; Wed, 11 Aug 2021 00:24:37 -0700 (PDT) Received: by mail-oi1-x233.google.com with SMTP id u25so3275426oiv.5 for ; Wed, 11 Aug 2021 00:24:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:message-id:in-reply-to:references:subject :mime-version:content-transfer-encoding; bh=zLcvWHqGlUYpyKfVJfBeyL9NoulUs7BbneGatMpfIYA=; b=kx+6sJBIrHrXkdK3iOxIv21pCzIT5DqiayWXQ8aeNVOJ0NKt6+Jzn2KGCZs7g2TOUt jSfUDNqf6pvoQVLpGN7Fis/uisL3raMQmb9m8QIctXlBDi4Rvn3Rtjp2cM793yqxM5YQ XTMBfm/DodYHiv1F2xx2x12j8govA8Ogq5z8g0tOX3ERm17d0YpQgHmZKfeu4hse+oGQ xGAJfwQcfF8Lf08rruN2/Be4t3Gv0i1oiICvXPA8a/2ILYI3/BM07tjspbzTsp4KDmbD Dk4UrYWQaZCfI4ZS2Hv+8Lmo+8+4Bg/e/7zGpcfeU7dQ3LPZW0JFXTBX8bBe2Y0Srpsn usYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:message-id:in-reply-to :references:subject:mime-version:content-transfer-encoding; bh=zLcvWHqGlUYpyKfVJfBeyL9NoulUs7BbneGatMpfIYA=; b=EI2i7boP/CWe9Qul9hFOrUMXCBUhyPKwj36P+WAF5Bhw6WNrM8b2WYOVMtEC0BIUWq hJftWUKiIWdx/2o42mUtZlVdYjP+/U2FmffuvHY/CwVKfrz5EeeuWBCuDv0utQpvns4M VKwi7IhX3IjXd6Xjeu26jJowBrafxrSaoprqN+niQEyUjGdTDURgttOfsEHYRh2+FQOh fmw9goTIhOMsgWvN/QK1DHuEGvaZiKubf0WhOKZJcPHnwoGvKjKTNQVqNv8Oj3tpX7Je HzDV3w547ewvlf+iQSMsFbj4gSTlRp6O5ASnkozzXbn0WnF4ModcwqnvKhTwbYHtK1Ny cB/A== X-Gm-Message-State: AOAM531wOJPFHT6L/jHSj5HDi4nLINZ5viMPvXTk99+prOE5Zpk6ATWR 0KfNr4P6iOiZdsXFLxatltw= X-Google-Smtp-Source: ABdhPJwH4ycvCDvKA/iQ0q6Mnwn64pQkbtJnAWdOT0z1EgcXmdhnHwDz7xftdfq4r6QZN+FjhUrWAA== X-Received: by 2002:a05:6808:1925:: with SMTP id bf37mr6772158oib.154.1628666677225; Wed, 11 Aug 2021 00:24:37 -0700 (PDT) Received: from localhost (fixed-187-189-69-1.totalplay.net. [187.189.69.1]) by smtp.gmail.com with ESMTPSA id b24sm1205690otf.0.2021.08.11.00.24.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Aug 2021 00:24:36 -0700 (PDT) Date: Wed, 11 Aug 2021 02:24:35 -0500 From: Felipe Contreras To: Bagas Sanjaya , Felipe Contreras , git@vger.kernel.org Cc: Jonathan Nieder , Matthieu Moy , Michael J Gruber Message-ID: <61137b336b712_209a208f7@natae.notmuch> In-Reply-To: <8034894f-a8dd-e1ee-1825-7cb172afdba3@gmail.com> References: <20210811045727.2381-1-felipe.contreras@gmail.com> <20210811045727.2381-7-felipe.contreras@gmail.com> <8034894f-a8dd-e1ee-1825-7cb172afdba3@gmail.com> Subject: Re: [PATCH 6/7] stage: add 'diff' subcommand Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Bagas Sanjaya wrote: > On 11/08/21 11.57, Felipe Contreras wrote: > > @@ -12,6 +12,7 @@ SYNOPSIS > > 'git stage' [options] [--] [...] > > 'git stage' (-a | --add) [options] [--] [...] > > 'git stage' (-r | --remove) [options] [--] [...] > > +'git stage' (-d | --diff) [options] [--] [...] > > > > > > DESCRIPTION > > @@ -32,11 +33,15 @@ OPTIONS > > --remove:: > > Remove changes from the staging area. See linkgit:git-reset[1]. > > > > +-d:: > > +--diff:: > > + View the changes staged for the next commit. See linkgit:git-diff[1]. > > > > Is it synonym to `git diff --staged`? Yes, it's the same thing. Although from discussions in 2013 people found it odd that the option is --staged when specifying something that affects the future. It should probably be `git diff --stage`. -- Felipe Contreras