From patchwork Thu Oct 28 16:21:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jean-No=C3=ABl_Avila?= X-Patchwork-Id: 12590513 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 711FBC433F5 for ; Thu, 28 Oct 2021 16:22:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 59CB4610CA for ; Thu, 28 Oct 2021 16:22:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230258AbhJ1QYf (ORCPT ); Thu, 28 Oct 2021 12:24:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230192AbhJ1QYe (ORCPT ); Thu, 28 Oct 2021 12:24:34 -0400 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A139FC061745 for ; Thu, 28 Oct 2021 09:22:07 -0700 (PDT) Received: by mail-wr1-x431.google.com with SMTP id d3so11177146wrh.8 for ; Thu, 28 Oct 2021 09:22:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:mime-version :content-transfer-encoding:fcc:to:cc; bh=p1ahdGu13XL0fyH2Unz47nL2oIoFyIdM8BeaWqqajgY=; b=c0Nsif24MEPkLFjpPLS5jqHrD9JgASl3vomd7u4L0HNVkFChDzqOFLdpPKY2Iooymz Gy8r9yoj0MDTtodKPXGN+wwoTg4dSDzG+idG7fhv86WQxQ2YTyjqNC7JDThivUDUYHyq oFbqvZ+08jVJ+7563Md36NLGrjpEs3iuvnvVFH2aeTUlTFfsNwX4eXzOafMK1z13JRyK 577Wdvx/yLsf/pgpyuqOD5yr2PEeWmv4z5Ze4qVsze3sneX0hSZi2WMxw75UEtPauU+9 mNb+JUWELUCP2zyVFB3mdL5KjNWm3wpUkcnff6vKN+G5hp9w3Jkes6tNyNtyxV6A5+m5 U9pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:mime-version:content-transfer-encoding:fcc:to:cc; bh=p1ahdGu13XL0fyH2Unz47nL2oIoFyIdM8BeaWqqajgY=; b=zoctKKqtU2Om0jAYWOXzDLTMCmqotZ1Wj+m5QO5xIKWZ/7IO9QAjyveoGyZqvwjpuy XLGY3SBloXiMPljpbuzeWmYqNJ2jY0cpj3WoVbBe7gJgX3s6jJrYlfcfTjP34TC7p+aN DlZEQfXvXP3wB6kWP5j508G/6w27NBHwWuPjQJFTfUhbJOraBSWu0BZahiHaITPPKgmw dSUtUlz3PH0syDGVE+KmnAciZpNzY4EdkGSkmNNHtO+RV9qDa1r31f64e5us8EE3ZFxs RIqELUUDkF9kBYnBH/iDXee7H/K/LIbW0HDhCOOq5dzRcdfagDzibX1DynDDsZwWryOu 7L9Q== X-Gm-Message-State: AOAM531BVBGKhUQp0yHBLqsxDi0USESMqzPZBTg0snxtJQM1Kkr14Vus kWLLbSTJtGq/ifA+fu8JOdBJeHm8G7Q= X-Google-Smtp-Source: ABdhPJzCKtWOK4liHmZFPCaXa+WwwE8bvBIC25NmPcJcszIeYp1a8WjvrP0I2zjZaS2wo/EzNOMUUg== X-Received: by 2002:a05:6000:2a3:: with SMTP id l3mr6951951wry.12.1635438126347; Thu, 28 Oct 2021 09:22:06 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id m15sm2964829wmq.0.2021.10.28.09.22.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 09:22:06 -0700 (PDT) Message-Id: <4d1fa80d471e02f79803330dfff886e400fffdff.1635438124.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Thu, 28 Oct 2021 16:21:56 +0000 Subject: [PATCH v2 1/9] doc: fix git credential synopsis MIME-Version: 1.0 Fcc: Sent To: git@vger.kernel.org Cc: Martin =?utf-8?b?w4VncmVu?= , Eric Sunshine , =?utf-8?q?Jean-No=C3=ABl?= Avila , =?utf-8?q?Jean-No?= =?utf-8?q?=C3=ABl_Avila?= Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: =?utf-8?q?Jean-No=C3=ABl_Avila?= From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= The subcommand of git credential is not optional. Signed-off-by: Jean-Noël Avila --- Documentation/git-credential.txt | 2 +- builtin/credential.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-credential.txt b/Documentation/git-credential.txt index 206e3c5f407..f18673017f5 100644 --- a/Documentation/git-credential.txt +++ b/Documentation/git-credential.txt @@ -8,7 +8,7 @@ git-credential - Retrieve and store user credentials SYNOPSIS -------- ------------------ -git credential +'git credential' (fill|approve|reject) ------------------ DESCRIPTION diff --git a/builtin/credential.c b/builtin/credential.c index d75dcdc64aa..d7b304fa084 100644 --- a/builtin/credential.c +++ b/builtin/credential.c @@ -4,7 +4,7 @@ #include "config.h" static const char usage_msg[] = - "git credential [fill|approve|reject]"; + "git credential (fill|approve|reject)"; int cmd_credential(int argc, const char **argv, const char *prefix) { From patchwork Thu Oct 28 16:21:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jean-No=C3=ABl_Avila?= X-Patchwork-Id: 12590517 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D620EC4332F for ; Thu, 28 Oct 2021 16:22:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C1563610E5 for ; Thu, 28 Oct 2021 16:22:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230318AbhJ1QYh (ORCPT ); Thu, 28 Oct 2021 12:24:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230217AbhJ1QYf (ORCPT ); Thu, 28 Oct 2021 12:24:35 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38C74C061570 for ; Thu, 28 Oct 2021 09:22:08 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id o14so11132005wra.12 for ; Thu, 28 Oct 2021 09:22:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:mime-version :content-transfer-encoding:fcc:to:cc; bh=zIdJpkr1mGdk1nIZntrXZ8/kOMPNeGQpEJSf9XOB3gs=; b=im+MvOJtadfeHQ2gXzCqQDPwLQBlFizsZeCf4aqCBxA0FtUxA2URNP+XEsASHncKmI fYtq6XjULA0edtPWrbOAUdj5+DZL7qrymWSkOKtNuaRORPKM7wFUO4gxiQKEybNHRSES dixC6ijzh+1xksOfS3+RK53DB+RkAg7UiMKHFvE4NmM2Xd4yr9Tr8HnekwCQS8qqm8Bb Mc5n5C1QGQGKt12s6fbFlUTvRKNngqrkV7zPPBrVcZ+y/KRHrrHNJ74s6bG9fLnqADBe /JibF7djGffwpO4Sq+ecbPt8f05+DcbuweC3t3nyF0w5wwi8H+Vs/uEohfiK3+iDupe8 cVFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:mime-version:content-transfer-encoding:fcc:to:cc; bh=zIdJpkr1mGdk1nIZntrXZ8/kOMPNeGQpEJSf9XOB3gs=; b=EOPkKS0pzLIjvn6HRqOjFO3eecvbzfWmpdicKfQX4hO5A3AHj89v3SRuNPM3FyyfXX Vp31yRPRV3TigHbDZR4vwgLCVjnNO3JKilGyxbOIHte53TBFrSQZjxZVLN3QB5sFgWq6 zWR5opBa8WTXuNhwI0dfd6AwHkFOS9bgJgBsZIVPDRF+yhVzpze4MPNoCsIuMzLMElsL IAWNntDU7/5pr+d96RbYhjFsOETSeyf5nkpI50vkNQZ43A1wxGXBzMBSKl/04ia7TL2X E/drcr8geWhl914A4sgkOHFhr6JYcHDkkfEXygwjg+0BUVYPCPeV9d0HO3CYYPV0BgOW 7xxg== X-Gm-Message-State: AOAM531233ptFPcakTrQjUPmkV6mGq5SPI9i6hatYmbogqh7zYkT9bEs Lv/P470s0gMpSC4G+XAwFNRgETA4xsc= X-Google-Smtp-Source: ABdhPJz/S+nwQUfTSNkoS6y6dhnCMVmCjtf/1M90xICh04Ck4mulGKpiQd1qh4pwFLVabx2kplsOvA== X-Received: by 2002:a5d:6b04:: with SMTP id v4mr7161629wrw.148.1635438126850; Thu, 28 Oct 2021 09:22:06 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id n66sm3007238wmn.2.2021.10.28.09.22.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 09:22:06 -0700 (PDT) Message-Id: <0045fe6faeaa2beb63a1e63b3b7573ae06cfba38.1635438124.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Thu, 28 Oct 2021 16:21:57 +0000 Subject: [PATCH v2 2/9] doc: split placeholders as individual tokens MIME-Version: 1.0 Fcc: Sent To: git@vger.kernel.org Cc: Martin =?utf-8?b?w4VncmVu?= , Eric Sunshine , =?utf-8?q?Jean-No=C3=ABl?= Avila , =?utf-8?q?Jean-No?= =?utf-8?q?=C3=ABl_Avila?= Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: =?utf-8?q?Jean-No=C3=ABl_Avila?= From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= The placeholders represent atoms of tokens and must not be aggregates. Signed-off-by: Jean-Noël Avila --- Documentation/git-archimport.txt | 14 +++++++------- Documentation/git-p4.txt | 2 +- Documentation/git-web--browse.txt | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Documentation/git-archimport.txt b/Documentation/git-archimport.txt index a595a0ffeee..847777fd172 100644 --- a/Documentation/git-archimport.txt +++ b/Documentation/git-archimport.txt @@ -9,14 +9,14 @@ git-archimport - Import a GNU Arch repository into Git SYNOPSIS -------- [verse] -'git archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir] - [:] ... +'git archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D ] [-t ] + /[:]... DESCRIPTION ----------- Imports a project from one or more GNU Arch repositories. It will follow branches -and repositories within the namespaces defined by the +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 as a merge whenever possible (see discussion below). @@ -27,7 +27,7 @@ import new branches within the provided roots. It expects to be dealing with one project only. If it sees branches that have different roots, it will refuse to run. In that case, -edit your parameters to define clearly the scope of the +edit your / parameters to define clearly the scope of the import. 'git archimport' uses `tla` extensively in the background to access the @@ -42,7 +42,7 @@ incremental imports. While 'git archimport' will try to create sensible branch names for the archives that it imports, it is also possible to specify Git branch names -manually. To do so, write a Git branch name after each +manually. To do so, write a Git branch name after each / parameter, separated by a colon. This way, you can shorten the Arch branch names and convert Arch jargon to Git jargon, for example mapping a "PROJECT{litdd}devo{litdd}VERSION" branch to "master". @@ -104,8 +104,8 @@ OPTIONS Override the default tempdir. -:: - Archive/branch identifier in a format that `tla log` understands. +/:: + / identifier in a format that `tla log` understands. GIT diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index 38e5257b2a4..8a6addcf72f 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -361,7 +361,7 @@ These options can be used to modify 'git p4 submit' behavior. p4/master. See the "Sync options" section above for more information. ---commit |:: +--commit (|..):: Submit only the specified commit or range of commits, instead of the full list of changes that are in the current Git branch. diff --git a/Documentation/git-web--browse.txt b/Documentation/git-web--browse.txt index 8d162b56c59..f2f996cbe16 100644 --- a/Documentation/git-web--browse.txt +++ b/Documentation/git-web--browse.txt @@ -8,7 +8,7 @@ git-web--browse - Git helper script to launch a web browser SYNOPSIS -------- [verse] -'git web{litdd}browse' [] ... +'git web{litdd}browse' [] (|)... DESCRIPTION ----------- From patchwork Thu Oct 28 16:21:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jean-No=C3=ABl_Avila?= X-Patchwork-Id: 12590519 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A43C7C433F5 for ; Thu, 28 Oct 2021 16:22:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 85EDA610CF for ; Thu, 28 Oct 2021 16:22:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230340AbhJ1QYh (ORCPT ); Thu, 28 Oct 2021 12:24:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230271AbhJ1QYg (ORCPT ); Thu, 28 Oct 2021 12:24:36 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E62D4C061570 for ; Thu, 28 Oct 2021 09:22:08 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id m22so11280073wrb.0 for ; Thu, 28 Oct 2021 09:22:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:mime-version :content-transfer-encoding:fcc:to:cc; bh=vJpk0gvCUpmiiPNgbxKn6wumM8Jsy49YCCt2EBK+St0=; b=OnCaBGoHPPNF5Dp3JmSijDUDlT1HisBX/52Jn7v5HNfpPk1oVtQm/QNcEGhaYttyk5 4U4GDlkkXciV0nTDb59XMe90pLYyM94EiqL050KP5+LDplofDQmo+eQ036Kj6v1BJWYi naN5taYihCVFx3lT+iD9ZNsT45mvaLviHSEeQKM8A9bLdm5MPFFQ5CefSysE7GNsUNLB e5sHhjDemJEF9TwQCvDgQRIEpAh/ZoXU7a+pd5WQ0MA17omVCGsf2GnZ/urK1PiXKsko h64PjrAdw0daPWvIfg7UaOUzFl9a1PCV+39sSDOTKiWJ6gjYYNwZ9y5DLOP49jYgxOdv w73Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:mime-version:content-transfer-encoding:fcc:to:cc; bh=vJpk0gvCUpmiiPNgbxKn6wumM8Jsy49YCCt2EBK+St0=; b=5AohRXzvGg7SazJGFSpSc4oV3OWJ7qBTyR2isqQ3xQQhxR73hNlkoux7oIYK1mxKhl 0Upy/KGximuEbojVsOqSLoCpE0S8gmZbZQjtNXqzZDqasSpmURwDq6MtKt9TsukCLq0a RpfJRZksImZ7d29hwIiYEQuBlz6r3WSVEqByjTsPaoR5loCq58Z5QWDO7Ezj3P5qoP1S f2T4rZAplP0QkPsBRmL3HOEiaB7r7MurpGKQL2coN19wpcXqzJ9KJRTzHl5z3Nozzy3i 4Xdaf5qTjOoNPjaLVUKk5dm8fQzkGx3hzYQHAq7TrNqORR+vSFr6mE1O6DAXXyx29uCQ 6S4A== X-Gm-Message-State: AOAM5339GwDmWCo2w1Q5MCI/JG0Kz3/4FF53o+9bV4iZhRYh4SqcNrUA jMrT0puo7KrVzFNXEn3Tryc+6abJCIs= X-Google-Smtp-Source: ABdhPJxbofUY6ABpOdc00MX7rRSrHTDvRF/BPhx4aN3/qQ+UBjz2BkR0fJKMz8uht/lj8G4h60ocaw== X-Received: by 2002:a5d:6d86:: with SMTP id l6mr7090417wrs.69.1635438127435; Thu, 28 Oct 2021 09:22:07 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id f9sm3627987wrx.31.2021.10.28.09.22.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 09:22:07 -0700 (PDT) Message-Id: <4d2d198f57294d8307453bda784bf5efe5905f45.1635438124.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Thu, 28 Oct 2021 16:21:58 +0000 Subject: [PATCH v2 3/9] doc: express grammar placeholders between angle brackets MIME-Version: 1.0 Fcc: Sent To: git@vger.kernel.org Cc: Martin =?utf-8?b?w4VncmVu?= , Eric Sunshine , =?utf-8?q?Jean-No=C3=ABl?= Avila , =?utf-8?q?Jean-No?= =?utf-8?q?=C3=ABl_Avila?= Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: =?utf-8?q?Jean-No=C3=ABl_Avila?= From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= This rules discerns user inputs from verbatim options in the synopsis. Signed-off-by: Jean-Noël Avila --- Documentation/git-cherry-pick.txt | 6 ++-- Documentation/git-config.txt | 46 +++++++++++++-------------- Documentation/git-cvsexportcommit.txt | 4 +-- Documentation/git-gui.txt | 2 +- Documentation/git-help.txt | 6 ++-- Documentation/git-http-fetch.txt | 2 +- Documentation/git-init.txt | 2 +- Documentation/git-pack-objects.txt | 4 +-- Documentation/git-pack-redundant.txt | 2 +- Documentation/git-reflog.txt | 4 +-- Documentation/git-sparse-checkout.txt | 2 +- Documentation/git-stage.txt | 2 +- 12 files changed, 41 insertions(+), 41 deletions(-) diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 5d750314b29..78dcc9171fb 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -8,7 +8,7 @@ git-cherry-pick - Apply the changes introduced by some existing commits SYNOPSIS -------- [verse] -'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] +'git cherry-pick' [--edit] [-n] [-m ] [-s] [-x] [--ff] [-S[]] ... 'git cherry-pick' (--continue | --skip | --abort | --quit) @@ -81,8 +81,8 @@ OPTIONS described above, and `-r` was to disable it. Now the default is not to do `-x` so this option is a no-op. --m parent-number:: ---mainline parent-number:: +-m :: +--mainline :: Usually you cannot cherry-pick a merge because you do not know which side of the merge should be considered the mainline. This option specifies the parent number (starting from 1) of diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index 992225f6129..0e58970289b 100644 --- a/Documentation/git-config.txt +++ b/Documentation/git-config.txt @@ -9,20 +9,20 @@ git-config - Get and set repository or global options SYNOPSIS -------- [verse] -'git config' [] [--type=] [--fixed-value] [--show-origin] [--show-scope] [-z|--null] name [value [value-pattern]] -'git config' [] [--type=] --add name value -'git config' [] [--type=] [--fixed-value] --replace-all name value [value-pattern] -'git config' [] [--type=] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get name [value-pattern] -'git config' [] [--type=] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get-all name [value-pattern] -'git config' [] [--type=] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] [--name-only] --get-regexp name_regex [value-pattern] -'git config' [] [--type=] [-z|--null] --get-urlmatch name URL -'git config' [] [--fixed-value] --unset name [value-pattern] -'git config' [] [--fixed-value] --unset-all name [value-pattern] -'git config' [] --rename-section old_name new_name -'git config' [] --remove-section name +'git config' [] [--type=] [--fixed-value] [--show-origin] [--show-scope] [-z|--null] [ []] +'git config' [] [--type=] --add +'git config' [] [--type=] [--fixed-value] --replace-all [] +'git config' [] [--type=] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get [] +'git config' [] [--type=] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get-all [] +'git config' [] [--type=] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] [--name-only] --get-regexp [] +'git config' [] [--type=] [-z|--null] --get-urlmatch +'git config' [] [--fixed-value] --unset [] +'git config' [] [--fixed-value] --unset-all [] +'git config' [] --rename-section +'git config' [] --remove-section 'git config' [] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list -'git config' [] --get-color name [default] -'git config' [] --get-colorbool name [stdout-is-tty] +'git config' [] --get-color [] +'git config' [] --get-colorbool [] 'git config' [] -e | --edit DESCRIPTION @@ -102,9 +102,9 @@ OPTIONS in which section and variable names are lowercased, but subsection names are not. ---get-urlmatch name URL:: +--get-urlmatch :: When given a two-part name section.key, the value for - section..key whose part matches the best to the + section..key whose part matches the best to the given URL is returned (if no such key exists, the value for section.key is used as a fallback). When given just the section as name, do so for all the keys in the section and @@ -145,7 +145,7 @@ See also <>. read from or written to if `extensions.worktreeConfig` is present. If not it's the same as `--local`. --f config-file:: +-f :: --file config-file:: For writing options: write to the specified file rather than the repository `.git/config`. @@ -155,7 +155,7 @@ available files. + See also <>. ---blob blob:: +--blob :: Similar to `--file` but use the given blob instead of a file. E.g. you can use 'master:.gitmodules' to read values from the file '.gitmodules' in the master branch. See "SPECIFYING REVISIONS" @@ -246,18 +246,18 @@ Valid ``'s include: all queried config options with the scope of that value (local, global, system, command). ---get-colorbool name [stdout-is-tty]:: +--get-colorbool []:: - Find the color setting for `name` (e.g. `color.diff`) and output - "true" or "false". `stdout-is-tty` should be either "true" or + Find the color setting for `` (e.g. `color.diff`) and output + "true" or "false". `` should be either "true" or "false", and is taken into account when configuration says - "auto". If `stdout-is-tty` is missing, then checks the standard + "auto". If `` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise. When the color setting for `name` is undefined, the command uses `color.ui` as fallback. ---get-color name [default]:: +--get-color []:: Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard @@ -281,7 +281,7 @@ Valid ``'s include: --default :: When using `--get`, and the requested variable is not found, behave as if - were the value assigned to the that variable. + `` were the value assigned to the that variable. CONFIGURATION ------------- diff --git a/Documentation/git-cvsexportcommit.txt b/Documentation/git-cvsexportcommit.txt index 00154b6c85a..41c8a8a05c1 100644 --- a/Documentation/git-cvsexportcommit.txt +++ b/Documentation/git-cvsexportcommit.txt @@ -9,8 +9,8 @@ git-cvsexportcommit - Export a single commit to a CVS checkout SYNOPSIS -------- [verse] -'git cvsexportcommit' [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d cvsroot] - [-w cvsworkdir] [-W] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID +'git cvsexportcommit' [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d ] + [-w ] [-W] [-f] [-m ] [] DESCRIPTION diff --git a/Documentation/git-gui.txt b/Documentation/git-gui.txt index c9d7e96214f..e8f3ccb4337 100644 --- a/Documentation/git-gui.txt +++ b/Documentation/git-gui.txt @@ -8,7 +8,7 @@ git-gui - A portable graphical interface to Git SYNOPSIS -------- [verse] -'git gui' [] [arguments] +'git gui' [] [] DESCRIPTION ----------- diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt index 96d5f598b4b..44ea63cc6d3 100644 --- a/Documentation/git-help.txt +++ b/Documentation/git-help.txt @@ -9,14 +9,14 @@ SYNOPSIS -------- [verse] 'git help' [-a|--all [--[no-]verbose]] - [[-i|--info] [-m|--man] [-w|--web]] [COMMAND|GUIDE] + [[-i|--info] [-m|--man] [-w|--web]] [|] 'git help' [-g|--guides] 'git help' [-c|--config] DESCRIPTION ----------- -With no options and no COMMAND or GUIDE given, the synopsis of the 'git' +With no options and no '' or '' given, the synopsis of the 'git' command and a list of the most commonly used Git commands are printed on the standard output. @@ -33,7 +33,7 @@ variables. If an alias is given, git shows the definition of the alias on standard output. To get the manual page for the aliased command, use -`git COMMAND --help`. +`git --help`. Note that `git --help ...` is identical to `git help ...` because the former is internally converted into the latter. diff --git a/Documentation/git-http-fetch.txt b/Documentation/git-http-fetch.txt index 9fa17b60e43..fa4bb6cbc3e 100644 --- a/Documentation/git-http-fetch.txt +++ b/Documentation/git-http-fetch.txt @@ -9,7 +9,7 @@ git-http-fetch - Download from a remote Git repository via HTTP SYNOPSIS -------- [verse] -'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin | --packfile= | ] +'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w ] [--recover] [--stdin | --packfile= | ] DESCRIPTION ----------- diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt index b611d80697d..7781d0b3545 100644 --- a/Documentation/git-init.txt +++ b/Documentation/git-init.txt @@ -12,7 +12,7 @@ SYNOPSIS 'git init' [-q | --quiet] [--bare] [--template=] [--separate-git-dir ] [--object-format=] [-b | --initial-branch=] - [--shared[=]] [directory] + [--shared[=]] [] DESCRIPTION diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt index dbfd1f90175..f8344e1e5ba 100644 --- a/Documentation/git-pack-objects.txt +++ b/Documentation/git-pack-objects.txt @@ -13,8 +13,8 @@ SYNOPSIS [--no-reuse-delta] [--delta-base-offset] [--non-empty] [--local] [--incremental] [--window=] [--depth=] [--revs [--unpacked | --all]] [--keep-pack=] - [--stdout [--filter=] | base-name] - [--shallow] [--keep-true-parents] [--[no-]sparse] < object-list + [--stdout [--filter=] | ] + [--shallow] [--keep-true-parents] [--[no-]sparse] < DESCRIPTION diff --git a/Documentation/git-pack-redundant.txt b/Documentation/git-pack-redundant.txt index f2869da5728..ee7034b5e52 100644 --- a/Documentation/git-pack-redundant.txt +++ b/Documentation/git-pack-redundant.txt @@ -9,7 +9,7 @@ git-pack-redundant - Find redundant pack files SYNOPSIS -------- [verse] -'git pack-redundant' [ --verbose ] [ --alt-odb ] < --all | .pack filename ... > +'git pack-redundant' [ --verbose ] [ --alt-odb ] ( --all | ... ) DESCRIPTION ----------- diff --git a/Documentation/git-reflog.txt b/Documentation/git-reflog.txt index ff487ff77d3..5ced7ad4f8b 100644 --- a/Documentation/git-reflog.txt +++ b/Documentation/git-reflog.txt @@ -17,12 +17,12 @@ The command takes various subcommands, and different options depending on the subcommand: [verse] -'git reflog' ['show'] [log-options] [] +'git reflog' ['show'] [] [] 'git reflog expire' [--expire=