From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.7 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id E7CBB20437 for ; Thu, 12 Oct 2017 10:46:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752138AbdJLKqY (ORCPT ); Thu, 12 Oct 2017 06:46:24 -0400 Received: from ikke.info ([178.21.113.177]:48734 "EHLO vps892.directvps.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751455AbdJLKqX (ORCPT ); Thu, 12 Oct 2017 06:46:23 -0400 Received: by vps892.directvps.nl (Postfix, from userid 1008) id 126464403A4; Thu, 12 Oct 2017 12:46:22 +0200 (CEST) Date: Thu, 12 Oct 2017 12:46:22 +0200 From: Kevin Daudt To: "W. Trevor King" Cc: Git , Junio C Hamano Subject: Re: [PATCH] Documentation/merge-options.txt: Add -S/--gpg-sign Message-ID: <20171012104622.GB31559@alpha.vpn.ikke.info> References: <406769a31421cb26a0e1bcf6e15bcf7ab48617c8.1507798709.git.wking@tremily.us> <20171012104459.GA31559@alpha.vpn.ikke.info> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20171012104459.GA31559@alpha.vpn.ikke.info> User-Agent: Mutt/1.8.3 (2017-05-23) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Thu, Oct 12, 2017 at 12:44:59PM +0200, Kevin Daudt wrote: > On Thu, Oct 12, 2017 at 02:02:17AM -0700, W. Trevor King wrote: > > Pull has supported these since ea230d8 (pull: add the --gpg-sign > > option, 2014-02-10). Insert in long-option alphabetical order > > following 7c85d274 (Documentation/merge-options.txt: order options in > > alphabetical groups, 2009-10-22). > > > > Signed-off-by: W. Trevor King > > --- > > This patch is based on maint. It will have trivial conflicts with the > > --signoff docs which landed in 14d01b4f07 (merge: add a --signoff > > flag, 2017-07-04, v2.15.0-rc0~138^2). > > > > Documentation/git-merge.txt | 6 ------ > > Documentation/merge-options.txt | 6 ++++++ > > 2 files changed, 6 insertions(+), 6 deletions(-) > > > > diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt > > index f90faf7aaa..1d97a17904 100644 > > --- a/Documentation/git-merge.txt > > +++ b/Documentation/git-merge.txt > > @@ -64,12 +64,6 @@ OPTIONS > > ------- > > include::merge-options.txt[] > > > > --S[]:: > > ---gpg-sign[=]:: > > Shouldn't the options self be removed here too, not just the > explanation? > You can ignore this, it was just my mail client that colored the diff wrong, confusing me. > > - GPG-sign the resulting merge commit. The `keyid` argument is > > - optional and defaults to the committer identity; if specified, > > - it must be stuck to the option without a space. > > - > > -m :: > > Set the commit message to be used for the merge commit (in > > case one is created). > > diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt > > index 5b4a62e936..6d85a76872 100644 > > --- a/Documentation/merge-options.txt > > +++ b/Documentation/merge-options.txt > > @@ -42,6 +42,12 @@ set to `no` at the beginning of them. > > current `HEAD` is already up-to-date or the merge can be > > resolved as a fast-forward. > > > > +-S[]:: > > +--gpg-sign[=]:: > > + GPG-sign the resulting merge commit. The `keyid` argument is > > + optional and defaults to the committer identity; if specified, > > + it must be stuck to the option without a space. > > + > > --log[=]:: > > --no-log:: > > In addition to branch names, populate the log message with > > -- > > 2.13.6 > >