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=-3.5 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, 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 18DD11F8C5 for ; Thu, 17 Mar 2022 18:09:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237209AbiCQSK2 (ORCPT ); Thu, 17 Mar 2022 14:10:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237191AbiCQSKV (ORCPT ); Thu, 17 Mar 2022 14:10:21 -0400 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E7E0138588 for ; Thu, 17 Mar 2022 11:09:03 -0700 (PDT) Received: by mail-wr1-x42f.google.com with SMTP id a1so7100015wrh.10 for ; Thu, 17 Mar 2022 11:09:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8DFr3eM+/XMAxCx4FYp6g0nid7x1TAE+PlzbP76MxV4=; b=gGEiRhXMp/+y1khAQjlX0Z0+1wIUoDHuNMby6yxt+MHUzf8NUsgt+CAgG0b8GjdGKc /c/2RnfGI0vf/Q3XjCrcO+XG7SRd66TbN8WmlDwtV6i+fmf9CUEI0zxUxxemToQTQwRE k4+uXujJTncX2v2wj/mCTT39VFVofU7SAhwjCx7hwW2mrP59TOI05vTUYmuhZMgtUY1o p0DHOHLg8vkaZ4BJ1zznpfveqs0PT/hMaD/JbA+sG1gws9SWUG9CIEGRU7HqHdikOBGi T0WDQK4BmwOskVpXewszaXaoguee7nPMs2idTJIq4qelCzl8dKUs9vTqj3POQKiUHYMh Ri5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8DFr3eM+/XMAxCx4FYp6g0nid7x1TAE+PlzbP76MxV4=; b=oapdNyk+u9F/K+aN6L/XcwB8UtN8VUmzmMl4hUlIGNZtGU7PcZ58gcP8cvEG2NFies 60llsWdLSKWzDxuUkQWheVg7lrhxvxFtSUrb4tAn0lvfmSlqMY5AYimT+4rqHOvZqenI P11pjToiFDyPSwU9MXEMb8TSmhJbXahWj+iGFXFJvuq0c9igl6BLh1MKrIvf1NQjK63a UCW+xYvQR2z4PfjfeaE6kHV2QO5ZLB13En4V1IKIaJxuRgQzdZhov5g2GYlqAWDMGGZJ ocIfBcE16lF1XnYthxqXQ5zoUK/XcT4Zm8K5glB5i6Zj3UYMYyULebITPWhLFv69mtWv WQiw== X-Gm-Message-State: AOAM532vscXA9rW2orPxL6CmhErQXeOAIh32v//1X+aq1Iabo6C8hAOX bne4FOJ6zhYXuRLEld8xcTkyPqRU1z6SQA== X-Google-Smtp-Source: ABdhPJwv5gDBfSOsG6MpbeXKD4J8/BWy/9IVISRCF3Hj56rXwFqq/5S6Th5yjruXvW5gWVhxW/4pZQ== X-Received: by 2002:a05:6000:144b:b0:1fe:ac08:7038 with SMTP id v11-20020a056000144b00b001feac087038mr5028797wrx.318.1647540541436; Thu, 17 Mar 2022 11:09:01 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id n8-20020a5d5988000000b00203d5f1f3e4sm4756253wri.105.2022.03.17.11.09.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Mar 2022 11:09:00 -0700 (PDT) From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= To: git@vger.kernel.org Cc: Junio C Hamano , John Cai , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH 8/8] reflog [show]: display sensible -h output Date: Thu, 17 Mar 2022 19:08:40 +0100 Message-Id: X-Mailer: git-send-email 2.35.1.1384.g7d2906948a1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Change the "git reflog show -h" output to show the usage summary relevant to it, rather than displaying the same output that "git log -h" would show. Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/reflog.c | 25 +++++++++++++++++++++++-- t/t1410-reflog.sh | 5 +++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/builtin/reflog.c b/builtin/reflog.c index 3971921fc14..aaf65ed31c6 100644 --- a/builtin/reflog.c +++ b/builtin/reflog.c @@ -5,6 +5,9 @@ #include "worktree.h" #include "reflog.h" +#define BUILTIN_REFLOG_SHOW_USAGE \ + N_("git reflog [show] [] []") + #define BUILTIN_REFLOG_EXPIRE_USAGE \ N_("git reflog expire [--expire=