From patchwork Wed Sep 19 20:12:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frederick Eaton X-Patchwork-Id: 10606537 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0B25A913 for ; Wed, 19 Sep 2018 20:44:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E63EB2CAC8 for ; Wed, 19 Sep 2018 20:44:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DA63A2CACD; Wed, 19 Sep 2018 20:44:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 824782CAC8 for ; Wed, 19 Sep 2018 20:44:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731253AbeITCYA (ORCPT ); Wed, 19 Sep 2018 22:24:00 -0400 Received: from ICGRIDDB04.SEAS.UPENN.EDU ([158.130.57.72]:44786 "EHLO ICGRIDDB04.SEAS.upenn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727676AbeITCYA (ORCPT ); Wed, 19 Sep 2018 22:24:00 -0400 X-Greylist: delayed 1889 seconds by postgrey-1.27 at vger.kernel.org; Wed, 19 Sep 2018 22:24:00 EDT Received: from [10.13.0.14] (helo=ofb.net) by ICGRIDDB04.SEAS.upenn.edu with esmtp (Exim 4.89) (envelope-from ) id 1g2iqP-0001yh-Le; Wed, 19 Sep 2018 16:13:05 -0400 Received: from amenhotep (unknown [173.239.75.234]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ofb.net (Postfix) with ESMTPSA id 71D303EE59; Wed, 19 Sep 2018 13:13:00 -0700 (PDT) Received: from frederik by amenhotep with local (Exim 4.91) (envelope-from ) id 1g2iqJ-0000Ag-VJ; Wed, 19 Sep 2018 20:12:59 +0000 From: Frederick Eaton To: Junio C Hamano Cc: git@vger.kernel.org, Frederick Eaton Subject: [PATCH 1/3] git-archimport.1: specify what kind of Arch we're talking about Date: Wed, 19 Sep 2018 13:12:29 -0700 Message-Id: <20180919201231.609-2-frederik@ofb.net> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180919201231.609-1-frederik@ofb.net> References: <20180919201231.609-1-frederik@ofb.net> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Is it a CPU architecture? Is it Arch Linux? If you search for "arch repository", nothing relevant comes up. Let's call it GNU Arch so people can find it with search engines. Signed-off-by: Frederick Eaton --- Documentation/git-archimport.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/git-archimport.txt b/Documentation/git-archimport.txt index ea7065336..a595a0ffe 100644 --- a/Documentation/git-archimport.txt +++ b/Documentation/git-archimport.txt @@ -3,7 +3,7 @@ git-archimport(1) NAME ---- -git-archimport - Import an Arch repository into Git +git-archimport - Import a GNU Arch repository into Git SYNOPSIS @@ -14,7 +14,8 @@ SYNOPSIS DESCRIPTION ----------- -Imports a project from one or more Arch repositories. It will follow branches +Imports a project from one or more GNU Arch repositories. +It will follow branches and repositories within the namespaces defined by the parameters supplied. If it cannot find the remote branch a merge comes from it will just import it as a regular commit. If it can find it, it will mark it From patchwork Wed Sep 19 20:12:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frederick Eaton X-Patchwork-Id: 10606557 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6BC66112B for ; Wed, 19 Sep 2018 20:53:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 593862AFDB for ; Wed, 19 Sep 2018 20:53:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4BEDE2B027; Wed, 19 Sep 2018 20:53:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DFF5A2AFDB for ; Wed, 19 Sep 2018 20:53:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731811AbeITCd1 (ORCPT ); Wed, 19 Sep 2018 22:33:27 -0400 Received: from ICGRIDDB04.SEAS.UPENN.EDU ([158.130.57.72]:44930 "EHLO ICGRIDDB04.SEAS.upenn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731661AbeITCd1 (ORCPT ); Wed, 19 Sep 2018 22:33:27 -0400 Received: from [10.13.0.14] (helo=ofb.net) by ICGRIDDB04.SEAS.upenn.edu with esmtp (Exim 4.89) (envelope-from ) id 1g2iqS-0001yi-MI; Wed, 19 Sep 2018 16:13:08 -0400 Received: from amenhotep (unknown [173.239.75.234]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ofb.net (Postfix) with ESMTPSA id 7CD0F3EE5A; Wed, 19 Sep 2018 13:13:03 -0700 (PDT) Received: from frederik by amenhotep with local (Exim 4.91) (envelope-from ) id 1g2iqN-0000GS-1J; Wed, 19 Sep 2018 20:13:03 +0000 From: Frederick Eaton To: Junio C Hamano Cc: git@vger.kernel.org, Frederick Eaton Subject: [PATCH 2/3] git-column.1: clarify initial description, provide examples Date: Wed, 19 Sep 2018 13:12:30 -0700 Message-Id: <20180919201231.609-3-frederik@ofb.net> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180919201231.609-1-frederik@ofb.net> References: <20180919201231.609-1-frederik@ofb.net> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When I read this man page I couldn't figure out what kind of input it was referring to, or how input was being put into columns, or where I should look for the syntax of the --mode option. Signed-off-by: Frederick Eaton --- Documentation/git-column.txt | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/Documentation/git-column.txt b/Documentation/git-column.txt index 03d18465d..5bbb51068 100644 --- a/Documentation/git-column.txt +++ b/Documentation/git-column.txt @@ -13,7 +13,10 @@ SYNOPSIS DESCRIPTION ----------- -This command formats its input into multiple columns. +This command formats the lines of its standard input into a table with +multiple columns. Each input line occupies one cell of the table. It +is used internally by other git commands to format output into +columns. OPTIONS ------- @@ -23,7 +26,7 @@ OPTIONS --mode=:: Specify layout mode. See configuration variable column.ui for option - syntax. + syntax (in git-config(1)). --raw-mode=:: Same as --mode but take mode encoded as a number. This is mainly used @@ -43,6 +46,34 @@ OPTIONS --padding=:: The number of spaces between columns. One space by default. +EXAMPLES +------ + +Format data by columns: +------------ +$ seq 1 24 | git column --mode=column --padding=5 +1 4 7 10 13 16 19 22 +2 5 8 11 14 17 20 23 +3 6 9 12 15 18 21 24 +------------ + +Format data by rows: +------------ +$ seq 1 21 | git column --mode=row --padding=5 +1 2 3 4 5 6 7 +8 9 10 11 12 13 14 +15 16 17 18 19 20 21 +------------ + +List some tags in a table with unequal column widths: +------------ +$ git tag --list 'v2.4.*' --column=row,dense +v2.4.0 v2.4.0-rc0 v2.4.0-rc1 v2.4.0-rc2 v2.4.0-rc3 +v2.4.1 v2.4.10 v2.4.11 v2.4.12 v2.4.2 +v2.4.3 v2.4.4 v2.4.5 v2.4.6 v2.4.7 +v2.4.8 v2.4.9 +------------ + GIT --- Part of the linkgit:git[1] suite From patchwork Wed Sep 19 20:12:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frederick Eaton X-Patchwork-Id: 10606555 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E7B1C112B for ; Wed, 19 Sep 2018 20:53:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D824A2AFD4 for ; Wed, 19 Sep 2018 20:53:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CC1F82B01A; Wed, 19 Sep 2018 20:53:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7C2F82AFD4 for ; Wed, 19 Sep 2018 20:53:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728245AbeITCdN (ORCPT ); Wed, 19 Sep 2018 22:33:13 -0400 Received: from ICGRIDDB04.SEAS.UPENN.EDU ([158.130.57.72]:44912 "EHLO ICGRIDDB04.SEAS.upenn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727983AbeITCdN (ORCPT ); Wed, 19 Sep 2018 22:33:13 -0400 Received: from [10.13.0.14] (helo=ofb.net) by ICGRIDDB04.SEAS.upenn.edu with esmtp (Exim 4.89) (envelope-from ) id 1g2iqX-0001yo-A1; Wed, 19 Sep 2018 16:13:13 -0400 Received: from amenhotep (unknown [173.239.75.234]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ofb.net (Postfix) with ESMTPSA id 1D6193EE59; Wed, 19 Sep 2018 13:13:08 -0700 (PDT) Received: from frederik by amenhotep with local (Exim 4.91) (envelope-from ) id 1g2iqR-0000Gc-FC; Wed, 19 Sep 2018 20:13:07 +0000 From: Frederick Eaton To: Junio C Hamano Cc: git@vger.kernel.org, Frederick Eaton Subject: [PATCH 3/3] git-describe.1: clarify that "human readable" is also git-readable Date: Wed, 19 Sep 2018 13:12:31 -0700 Message-Id: <20180919201231.609-4-frederik@ofb.net> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180919201231.609-1-frederik@ofb.net> References: <20180919201231.609-1-frederik@ofb.net> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The caption uses the term "human readable", but the DESCRIPTION did not explain this in context. Signed-off-by: Frederick Eaton --- Documentation/git-describe.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt index e027fb8c4..ccdc5f83d 100644 --- a/Documentation/git-describe.txt +++ b/Documentation/git-describe.txt @@ -18,7 +18,9 @@ The command finds the most recent tag that is reachable from a commit. If the tag points to the commit, then only the tag is shown. Otherwise, it suffixes the tag name with the number of additional commits on top of the tagged object and the -abbreviated object name of the most recent commit. +abbreviated object name of the most recent commit. The result +is a "human-readable" object name which can also be used to +identify the commit to other git commands. By default (without --all or --tags) `git describe` only shows annotated tags. For more information about creating annotated tags