From patchwork Sat Oct 20 12:37:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650403 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 A79CA18A7 for ; Sat, 20 Oct 2018 12:39:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8FD722861E for ; Sat, 20 Oct 2018 12:39:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6C76928632; Sat, 20 Oct 2018 12:39:12 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 3135F2861E for ; Sat, 20 Oct 2018 12:39:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727364AbeJTUtU (ORCPT ); Sat, 20 Oct 2018 16:49:20 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:43369 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727289AbeJTUtU (ORCPT ); Sat, 20 Oct 2018 16:49:20 -0400 Received: by mail-lj1-f196.google.com with SMTP id r8-v6so33085795ljc.10 for ; Sat, 20 Oct 2018 05:38:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5JecqEokIeoo/YSwSG5/tAy/giPcWrXEIG1KjgWtbP4=; b=TtXW1fCKdXMoU+T1OlHuFuNPW3D/7eg4JeOarRwcEUik4xgjavcR6muWxFPl3q1CjJ 930BqxkKTxAiVhoxhZG1VZ6H2OWB0iftz1YB1DqgXqZSsQLgUg+UuSqtfKEldiTSyZIt zH+MSsALmAs5izfypZDreja4B39jWAceiPBlBYjpSVJF3SeDQOlKRMyoirT17uJamAuS s2NCi/zsFylgiTRHF0EJb23r+iSi1MZj9M6FJci4v+vMoxO+GwC+MN+q2caABmsGN+jl Yx2cgXIfFYvJNAdPGturBRjTw7D5x2U7m0ErXinOF6U9mblV1IxOBMu8BctDBJ4w48az 9JLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5JecqEokIeoo/YSwSG5/tAy/giPcWrXEIG1KjgWtbP4=; b=rulMhCxFAnK4aoXt+wEYY5ElCcAq6gYkEE1TGO5fcN769hrgQFfYRKx3sACARZ8jbg 9nKvv9e10+9js65xQwk2R0zE/YfGsuzVU7266Rkn9ISnMzfGKnyXH+dT74utm4VNy3A2 mjERmSKTkUW1hFyyNB+SPH//0f4xgRL03BcoHMCg3cZpL58F7vLkXQLweUjL/4d1k3sj 5zkLh2KrDRtpLffaimsWjdhmnCNahifZTsKkk6GVchJ2jwq1db2Qz2PrHPdBEjTasLSL 9K9x5h9rarFmwHZe5N+OEEhww/IB77DnYLIB8zeetVVCAiI4CYVKagGSkGImTLtYEZds XY8Q== X-Gm-Message-State: ABuFfogZU4+WRkdRJcOahfvz55p1VZWiz+JkCHWzkvJ1qwfqAFicX4hA 8JWIf4ZDXeNFCPHH483h2Mosf9XZ X-Google-Smtp-Source: AJdET5fj3fLWZWQRyfgnOIueuL+b14k/qoS4wzbSoPVcaEWTCfzfgG+cjTW6L7iLgs6RX6w4mdPabA== X-Received: by 2002:a2e:5d8f:: with SMTP id v15-v6mr1092614lje.86.1540039137724; Sat, 20 Oct 2018 05:38:57 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.38.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:38:56 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 01/59] config.txt: move advice.* to a separate file Date: Sat, 20 Oct 2018 14:37:50 +0200 Message-Id: <20181020123848.2785-2-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/advice-config.txt | 82 ++++++++++++++++++++++++++++++++ Documentation/config.txt | 84 +-------------------------------- 2 files changed, 83 insertions(+), 83 deletions(-) create mode 100644 Documentation/advice-config.txt diff --git a/Documentation/advice-config.txt b/Documentation/advice-config.txt new file mode 100644 index 0000000000..7f80cddcd4 --- /dev/null +++ b/Documentation/advice-config.txt @@ -0,0 +1,82 @@ +advice.*:: + These variables control various optional help messages designed to + aid new users. All 'advice.*' variables default to 'true', and you + can tell Git that you do not need help by setting these to 'false': ++ +-- + pushUpdateRejected:: + Set this variable to 'false' if you want to disable + 'pushNonFFCurrent', + 'pushNonFFMatching', 'pushAlreadyExists', + 'pushFetchFirst', and 'pushNeedsForce' + simultaneously. + pushNonFFCurrent:: + Advice shown when linkgit:git-push[1] fails due to a + non-fast-forward update to the current branch. + pushNonFFMatching:: + Advice shown when you ran linkgit:git-push[1] and pushed + 'matching refs' explicitly (i.e. you used ':', or + specified a refspec that isn't your current branch) and + it resulted in a non-fast-forward error. + pushAlreadyExists:: + Shown when linkgit:git-push[1] rejects an update that + does not qualify for fast-forwarding (e.g., a tag.) + pushFetchFirst:: + Shown when linkgit:git-push[1] rejects an update that + tries to overwrite a remote ref that points at an + object we do not have. + pushNeedsForce:: + Shown when linkgit:git-push[1] rejects an update that + tries to overwrite a remote ref that points at an + object that is not a commit-ish, or make the remote + ref point at an object that is not a commit-ish. + statusHints:: + Show directions on how to proceed from the current + state in the output of linkgit:git-status[1], in + the template shown when writing commit messages in + linkgit:git-commit[1], and in the help message shown + by linkgit:git-checkout[1] when switching branch. + statusUoption:: + Advise to consider using the `-u` option to linkgit:git-status[1] + when the command takes more than 2 seconds to enumerate untracked + files. + commitBeforeMerge:: + Advice shown when linkgit:git-merge[1] refuses to + merge to avoid overwriting local changes. + resolveConflict:: + Advice shown by various commands when conflicts + prevent the operation from being performed. + implicitIdentity:: + Advice on how to set your identity configuration when + your information is guessed from the system username and + domain name. + detachedHead:: + Advice shown when you used linkgit:git-checkout[1] to + move to the detach HEAD state, to instruct how to create + a local branch after the fact. + checkoutAmbiguousRemoteBranchName:: + Advice shown when the argument to + linkgit:git-checkout[1] ambiguously resolves to a + remote tracking branch on more than one remote in + situations where an unambiguous argument would have + otherwise caused a remote-tracking branch to be + checked out. See the `checkout.defaultRemote` + configuration variable for how to set a given remote + to used by default in some situations where this + advice would be printed. + amWorkDir:: + Advice that shows the location of the patch file when + linkgit:git-am[1] fails to apply it. + rmHints:: + In case of failure in the output of linkgit:git-rm[1], + show directions on how to proceed from the current state. + addEmbeddedRepo:: + Advice on what to do when you've accidentally added one + git repo inside of another. + ignoredHook:: + Advice shown if a hook is ignored because the hook is not + set as executable. + waitingForEditor:: + Print a message to the terminal whenever Git is waiting for + editor input from the user. +-- diff --git a/Documentation/config.txt b/Documentation/config.txt index 552827935a..a0b0ef582f 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -287,89 +287,7 @@ inventing new variables for use in your own tool, make sure their names do not conflict with those that are used by Git itself and other popular tools, and describe them in your documentation. - -advice.*:: - These variables control various optional help messages designed to - aid new users. All 'advice.*' variables default to 'true', and you - can tell Git that you do not need help by setting these to 'false': -+ --- - pushUpdateRejected:: - Set this variable to 'false' if you want to disable - 'pushNonFFCurrent', - 'pushNonFFMatching', 'pushAlreadyExists', - 'pushFetchFirst', and 'pushNeedsForce' - simultaneously. - pushNonFFCurrent:: - Advice shown when linkgit:git-push[1] fails due to a - non-fast-forward update to the current branch. - pushNonFFMatching:: - Advice shown when you ran linkgit:git-push[1] and pushed - 'matching refs' explicitly (i.e. you used ':', or - specified a refspec that isn't your current branch) and - it resulted in a non-fast-forward error. - pushAlreadyExists:: - Shown when linkgit:git-push[1] rejects an update that - does not qualify for fast-forwarding (e.g., a tag.) - pushFetchFirst:: - Shown when linkgit:git-push[1] rejects an update that - tries to overwrite a remote ref that points at an - object we do not have. - pushNeedsForce:: - Shown when linkgit:git-push[1] rejects an update that - tries to overwrite a remote ref that points at an - object that is not a commit-ish, or make the remote - ref point at an object that is not a commit-ish. - statusHints:: - Show directions on how to proceed from the current - state in the output of linkgit:git-status[1], in - the template shown when writing commit messages in - linkgit:git-commit[1], and in the help message shown - by linkgit:git-checkout[1] when switching branch. - statusUoption:: - Advise to consider using the `-u` option to linkgit:git-status[1] - when the command takes more than 2 seconds to enumerate untracked - files. - commitBeforeMerge:: - Advice shown when linkgit:git-merge[1] refuses to - merge to avoid overwriting local changes. - resolveConflict:: - Advice shown by various commands when conflicts - prevent the operation from being performed. - implicitIdentity:: - Advice on how to set your identity configuration when - your information is guessed from the system username and - domain name. - detachedHead:: - Advice shown when you used linkgit:git-checkout[1] to - move to the detach HEAD state, to instruct how to create - a local branch after the fact. - checkoutAmbiguousRemoteBranchName:: - Advice shown when the argument to - linkgit:git-checkout[1] ambiguously resolves to a - remote tracking branch on more than one remote in - situations where an unambiguous argument would have - otherwise caused a remote-tracking branch to be - checked out. See the `checkout.defaultRemote` - configuration variable for how to set a given remote - to used by default in some situations where this - advice would be printed. - amWorkDir:: - Advice that shows the location of the patch file when - linkgit:git-am[1] fails to apply it. - rmHints:: - In case of failure in the output of linkgit:git-rm[1], - show directions on how to proceed from the current state. - addEmbeddedRepo:: - Advice on what to do when you've accidentally added one - git repo inside of another. - ignoredHook:: - Advice shown if a hook is ignored because the hook is not - set as executable. - waitingForEditor:: - Print a message to the terminal whenever Git is waiting for - editor input from the user. --- +include::advice-config.txt[] core.fileMode:: Tells Git if the executable bit of files in the working tree From patchwork Sat Oct 20 12:37:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650421 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 77BE217D4 for ; Sat, 20 Oct 2018 12:39:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5B14628620 for ; Sat, 20 Oct 2018 12:39:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4EFBA2861E; Sat, 20 Oct 2018 12:39:15 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 DA26A2862A for ; Sat, 20 Oct 2018 12:39:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727469AbeJTUt0 (ORCPT ); Sat, 20 Oct 2018 16:49:26 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:40818 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727289AbeJTUtZ (ORCPT ); Sat, 20 Oct 2018 16:49:25 -0400 Received: by mail-lj1-f195.google.com with SMTP id r83-v6so33086102ljr.7 for ; Sat, 20 Oct 2018 05:39:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=labR+SuX0c0y4ZNNYYpSxxWzZd8IPiF6lKvHv2qxCUc=; b=ru87CdMhyWqtr1anF0FxpoJfN3/GTc843ok6Nj3hhHdL2kgLJ8R6W5VV4J/Uy8PdNx /gtwllus/zs3X8a5JMxi8ON6a7WpZC6JFSQE7ObmXkXaQOjsqk5niXiOU6slBJukH571 RxjK+2Ssj2MBxi6d3+7047BzAOjH6glN64E5T7zm7ZraknKpE+eBuZyfGhyl9ydg5+yH zmTnrHsRqVoq+nZzrWT6lo7UHdBdqLwEgyufObXCJ+gyqEAKP00rj8oYO1sxuIF5OvUV lEb0JRlAKoGZCoaosOBsGuWX+aKSNx1BTKGka8iHqFSMNDro+fFBDPmBJGcfuD5J7b1G 1JgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=labR+SuX0c0y4ZNNYYpSxxWzZd8IPiF6lKvHv2qxCUc=; b=mHKZkxjr0pA1uKEcN9MD9czIxvZowgp3yIzR4+m6Af3+6x8YN5411CuoU35EkPcKut nnSdV39rZ7yrnxMTKT7gfOKm98ZfuL6MOKWk3XsKkzDcap9l6eGHQj1foaVnN5lQqCHj 0pZHL14sCCjsENwa8yNslAHRbyZ9ugF8Ec2wa95cqSP6M+KhGlR+KX89+qJu0l7CsEab W6ESJFGawp/7Sx/QWZOcCd7KUW8rJmck0DQ3/aRn1hXT/AafYQjQ9M9AvNJWYc4JN+Jv pp5P1D3ZFKL/EO2MHY7svwzwNgQt4tcGcltruwEQYpM+F21ayJcMz9X2x91fRIlIAivR g2Mw== X-Gm-Message-State: ABuFfogsrGPLqtzYQWhmzLpyHrFOCptaggSFQbKPJGKVNOotsx+6FS0u Ryj9BazxkiRIBdj8+gWT/oaC/kPg X-Google-Smtp-Source: AJdET5d218QdkD/WMPGk68wSkQPQM91OrPqW5oo2uwCqKvQHHf+RSSYYRNgBZXGM2VfL1sruHJiyQw== X-Received: by 2002:a2e:8945:: with SMTP id b5-v6mr801986ljk.20.1540039139046; Sat, 20 Oct 2018 05:38:59 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.38.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:38:58 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 02/59] config.txt: move core.* to a separate file Date: Sat, 20 Oct 2018 14:37:51 +0200 Message-Id: <20181020123848.2785-3-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 595 +--------------------------------- Documentation/core-config.txt | 594 +++++++++++++++++++++++++++++++++ 2 files changed, 595 insertions(+), 594 deletions(-) create mode 100644 Documentation/core-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index a0b0ef582f..27c2a211c0 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -289,600 +289,7 @@ other popular tools, and describe them in your documentation. include::advice-config.txt[] -core.fileMode:: - Tells Git if the executable bit of files in the working tree - is to be honored. -+ -Some filesystems lose the executable bit when a file that is -marked as executable is checked out, or checks out a -non-executable file with executable bit on. -linkgit:git-clone[1] or linkgit:git-init[1] probe the filesystem -to see if it handles the executable bit correctly -and this variable is automatically set as necessary. -+ -A repository, however, may be on a filesystem that handles -the filemode correctly, and this variable is set to 'true' -when created, but later may be made accessible from another -environment that loses the filemode (e.g. exporting ext4 via -CIFS mount, visiting a Cygwin created repository with -Git for Windows or Eclipse). -In such a case it may be necessary to set this variable to 'false'. -See linkgit:git-update-index[1]. -+ -The default is true (when core.filemode is not specified in the config file). - -core.hideDotFiles:: - (Windows-only) If true, mark newly-created directories and files whose - name starts with a dot as hidden. If 'dotGitOnly', only the `.git/` - directory is hidden, but no other files starting with a dot. The - default mode is 'dotGitOnly'. - -core.ignoreCase:: - Internal variable which enables various workarounds to enable - Git to work better on filesystems that are not case sensitive, - like APFS, HFS+, FAT, NTFS, etc. For example, if a directory listing - finds "makefile" when Git expects "Makefile", Git will assume - it is really the same file, and continue to remember it as - "Makefile". -+ -The default is false, except linkgit:git-clone[1] or linkgit:git-init[1] -will probe and set core.ignoreCase true if appropriate when the repository -is created. -+ -Git relies on the proper configuration of this variable for your operating -and file system. Modifying this value may result in unexpected behavior. - -core.precomposeUnicode:: - This option is only used by Mac OS implementation of Git. - When core.precomposeUnicode=true, Git reverts the unicode decomposition - of filenames done by Mac OS. This is useful when sharing a repository - between Mac OS and Linux or Windows. - (Git for Windows 1.7.10 or higher is needed, or Git under cygwin 1.7). - When false, file names are handled fully transparent by Git, - which is backward compatible with older versions of Git. - -core.protectHFS:: - If set to true, do not allow checkout of paths that would - be considered equivalent to `.git` on an HFS+ filesystem. - Defaults to `true` on Mac OS, and `false` elsewhere. - -core.protectNTFS:: - If set to true, do not allow checkout of paths that would - cause problems with the NTFS filesystem, e.g. conflict with - 8.3 "short" names. - Defaults to `true` on Windows, and `false` elsewhere. - -core.fsmonitor:: - If set, the value of this variable is used as a command which - will identify all files that may have changed since the - requested date/time. This information is used to speed up git by - avoiding unnecessary processing of files that have not changed. - See the "fsmonitor-watchman" section of linkgit:githooks[5]. - -core.trustctime:: - If false, the ctime differences between the index and the - working tree are ignored; useful when the inode change time - is regularly modified by something outside Git (file system - crawlers and some backup systems). - See linkgit:git-update-index[1]. True by default. - -core.splitIndex:: - If true, the split-index feature of the index will be used. - See linkgit:git-update-index[1]. False by default. - -core.untrackedCache:: - Determines what to do about the untracked cache feature of the - index. It will be kept, if this variable is unset or set to - `keep`. It will automatically be added if set to `true`. And - it will automatically be removed, if set to `false`. Before - setting it to `true`, you should check that mtime is working - properly on your system. - See linkgit:git-update-index[1]. `keep` by default. - -core.checkStat:: - When missing or is set to `default`, many fields in the stat - structure are checked to detect if a file has been modified - since Git looked at it. When this configuration variable is - set to `minimal`, sub-second part of mtime and ctime, the - uid and gid of the owner of the file, the inode number (and - the device number, if Git was compiled to use it), are - excluded from the check among these fields, leaving only the - whole-second part of mtime (and ctime, if `core.trustCtime` - is set) and the filesize to be checked. -+ -There are implementations of Git that do not leave usable values in -some fields (e.g. JGit); by excluding these fields from the -comparison, the `minimal` mode may help interoperability when the -same repository is used by these other systems at the same time. - -core.quotePath:: - Commands that output paths (e.g. 'ls-files', 'diff'), will - quote "unusual" characters in the pathname by enclosing the - pathname in double-quotes and escaping those characters with - backslashes in the same way C escapes control characters (e.g. - `\t` for TAB, `\n` for LF, `\\` for backslash) or bytes with - values larger than 0x80 (e.g. octal `\302\265` for "micro" in - UTF-8). If this variable is set to false, bytes higher than - 0x80 are not considered "unusual" any more. Double-quotes, - backslash and control characters are always escaped regardless - of the setting of this variable. A simple space character is - not considered "unusual". Many commands can output pathnames - completely verbatim using the `-z` option. The default value - is true. - -core.eol:: - Sets the line ending type to use in the working directory for - files that have the `text` property set when core.autocrlf is false. - Alternatives are 'lf', 'crlf' and 'native', which uses the platform's - native line ending. The default value is `native`. See - linkgit:gitattributes[5] for more information on end-of-line - conversion. - -core.safecrlf:: - If true, makes Git check if converting `CRLF` is reversible when - end-of-line conversion is active. Git will verify if a command - modifies a file in the work tree either directly or indirectly. - For example, committing a file followed by checking out the - same file should yield the original file in the work tree. If - this is not the case for the current setting of - `core.autocrlf`, Git will reject the file. The variable can - be set to "warn", in which case Git will only warn about an - irreversible conversion but continue the operation. -+ -CRLF conversion bears a slight chance of corrupting data. -When it is enabled, Git will convert CRLF to LF during commit and LF to -CRLF during checkout. A file that contains a mixture of LF and -CRLF before the commit cannot be recreated by Git. For text -files this is the right thing to do: it corrects line endings -such that we have only LF line endings in the repository. -But for binary files that are accidentally classified as text the -conversion can corrupt data. -+ -If you recognize such corruption early you can easily fix it by -setting the conversion type explicitly in .gitattributes. Right -after committing you still have the original file in your work -tree and this file is not yet corrupted. You can explicitly tell -Git that this file is binary and Git will handle the file -appropriately. -+ -Unfortunately, the desired effect of cleaning up text files with -mixed line endings and the undesired effect of corrupting binary -files cannot be distinguished. In both cases CRLFs are removed -in an irreversible way. For text files this is the right thing -to do because CRLFs are line endings, while for binary files -converting CRLFs corrupts data. -+ -Note, this safety check does not mean that a checkout will generate a -file identical to the original file for a different setting of -`core.eol` and `core.autocrlf`, but only for the current one. For -example, a text file with `LF` would be accepted with `core.eol=lf` -and could later be checked out with `core.eol=crlf`, in which case the -resulting file would contain `CRLF`, although the original file -contained `LF`. However, in both work trees the line endings would be -consistent, that is either all `LF` or all `CRLF`, but never mixed. A -file with mixed line endings would be reported by the `core.safecrlf` -mechanism. - -core.autocrlf:: - Setting this variable to "true" is the same as setting - the `text` attribute to "auto" on all files and core.eol to "crlf". - Set to true if you want to have `CRLF` line endings in your - working directory and the repository has LF line endings. - This variable can be set to 'input', - in which case no output conversion is performed. - -core.checkRoundtripEncoding:: - A comma and/or whitespace separated list of encodings that Git - performs UTF-8 round trip checks on if they are used in an - `working-tree-encoding` attribute (see linkgit:gitattributes[5]). - The default value is `SHIFT-JIS`. - -core.symlinks:: - If false, symbolic links are checked out as small plain files that - contain the link text. linkgit:git-update-index[1] and - linkgit:git-add[1] will not change the recorded type to regular - file. Useful on filesystems like FAT that do not support - symbolic links. -+ -The default is true, except linkgit:git-clone[1] or linkgit:git-init[1] -will probe and set core.symlinks false if appropriate when the repository -is created. - -core.gitProxy:: - A "proxy command" to execute (as 'command host port') instead - of establishing direct connection to the remote server when - using the Git protocol for fetching. If the variable value is - in the "COMMAND for DOMAIN" format, the command is applied only - on hostnames ending with the specified domain string. This variable - may be set multiple times and is matched in the given order; - the first match wins. -+ -Can be overridden by the `GIT_PROXY_COMMAND` environment variable -(which always applies universally, without the special "for" -handling). -+ -The special string `none` can be used as the proxy command to -specify that no proxy be used for a given domain pattern. -This is useful for excluding servers inside a firewall from -proxy use, while defaulting to a common proxy for external domains. - -core.sshCommand:: - If this variable is set, `git fetch` and `git push` will - use the specified command instead of `ssh` when they need to - connect to a remote system. The command is in the same form as - the `GIT_SSH_COMMAND` environment variable and is overridden - when the environment variable is set. - -core.ignoreStat:: - If true, Git will avoid using lstat() calls to detect if files have - changed by setting the "assume-unchanged" bit for those tracked files - which it has updated identically in both the index and working tree. -+ -When files are modified outside of Git, the user will need to stage -the modified files explicitly (e.g. see 'Examples' section in -linkgit:git-update-index[1]). -Git will not normally detect changes to those files. -+ -This is useful on systems where lstat() calls are very slow, such as -CIFS/Microsoft Windows. -+ -False by default. - -core.preferSymlinkRefs:: - Instead of the default "symref" format for HEAD - and other symbolic reference files, use symbolic links. - This is sometimes needed to work with old scripts that - expect HEAD to be a symbolic link. - -core.alternateRefsCommand:: - When advertising tips of available history from an alternate, use the shell to - execute the specified command instead of linkgit:git-for-each-ref[1]. The - first argument is the absolute path of the alternate. Output must contain one - hex object id per line (i.e., the same as produce by `git for-each-ref - --format='%(objectname)'`). -+ -Note that you cannot generally put `git for-each-ref` directly into the config -value, as it does not take a repository path as an argument (but you can wrap -the command above in a shell script). - -core.alternateRefsPrefixes:: - When listing references from an alternate, list only references that begin - with the given prefix. Prefixes match as if they were given as arguments to - linkgit:git-for-each-ref[1]. To list multiple prefixes, separate them with - whitespace. If `core.alternateRefsCommand` is set, setting - `core.alternateRefsPrefixes` has no effect. - -core.bare:: - If true this repository is assumed to be 'bare' and has no - working directory associated with it. If this is the case a - number of commands that require a working directory will be - disabled, such as linkgit:git-add[1] or linkgit:git-merge[1]. -+ -This setting is automatically guessed by linkgit:git-clone[1] or -linkgit:git-init[1] when the repository was created. By default a -repository that ends in "/.git" is assumed to be not bare (bare = -false), while all other repositories are assumed to be bare (bare -= true). - -core.worktree:: - Set the path to the root of the working tree. - If `GIT_COMMON_DIR` environment variable is set, core.worktree - is ignored and not used for determining the root of working tree. - This can be overridden by the `GIT_WORK_TREE` environment - variable and the `--work-tree` command-line option. - The value can be an absolute path or relative to the path to - the .git directory, which is either specified by --git-dir - or GIT_DIR, or automatically discovered. - If --git-dir or GIT_DIR is specified but none of - --work-tree, GIT_WORK_TREE and core.worktree is specified, - the current working directory is regarded as the top level - of your working tree. -+ -Note that this variable is honored even when set in a configuration -file in a ".git" subdirectory of a directory and its value differs -from the latter directory (e.g. "/path/to/.git/config" has -core.worktree set to "/different/path"), which is most likely a -misconfiguration. Running Git commands in the "/path/to" directory will -still use "/different/path" as the root of the work tree and can cause -confusion unless you know what you are doing (e.g. you are creating a -read-only snapshot of the same index to a location different from the -repository's usual working tree). - -core.logAllRefUpdates:: - Enable the reflog. Updates to a ref is logged to the file - "`$GIT_DIR/logs/`", by appending the new and old - SHA-1, the date/time and the reason of the update, but - only when the file exists. If this configuration - variable is set to `true`, missing "`$GIT_DIR/logs/`" - file is automatically created for branch heads (i.e. under - `refs/heads/`), remote refs (i.e. under `refs/remotes/`), - note refs (i.e. under `refs/notes/`), and the symbolic ref `HEAD`. - If it is set to `always`, then a missing reflog is automatically - created for any ref under `refs/`. -+ -This information can be used to determine what commit -was the tip of a branch "2 days ago". -+ -This value is true by default in a repository that has -a working directory associated with it, and false by -default in a bare repository. - -core.repositoryFormatVersion:: - Internal variable identifying the repository format and layout - version. - -core.sharedRepository:: - When 'group' (or 'true'), the repository is made shareable between - several users in a group (making sure all the files and objects are - group-writable). When 'all' (or 'world' or 'everybody'), the - repository will be readable by all users, additionally to being - group-shareable. When 'umask' (or 'false'), Git will use permissions - reported by umask(2). When '0xxx', where '0xxx' is an octal number, - files in the repository will have this mode value. '0xxx' will override - user's umask value (whereas the other options will only override - requested parts of the user's umask value). Examples: '0660' will make - the repo read/write-able for the owner and group, but inaccessible to - others (equivalent to 'group' unless umask is e.g. '0022'). '0640' is a - repository that is group-readable but not group-writable. - See linkgit:git-init[1]. False by default. - -core.warnAmbiguousRefs:: - If true, Git will warn you if the ref name you passed it is ambiguous - and might match multiple refs in the repository. True by default. - -core.compression:: - An integer -1..9, indicating a default compression level. - -1 is the zlib default. 0 means no compression, - and 1..9 are various speed/size tradeoffs, 9 being slowest. - If set, this provides a default to other compression variables, - such as `core.looseCompression` and `pack.compression`. - -core.looseCompression:: - An integer -1..9, indicating the compression level for objects that - are not in a pack file. -1 is the zlib default. 0 means no - compression, and 1..9 are various speed/size tradeoffs, 9 being - slowest. If not set, defaults to core.compression. If that is - not set, defaults to 1 (best speed). - -core.packedGitWindowSize:: - Number of bytes of a pack file to map into memory in a - single mapping operation. Larger window sizes may allow - your system to process a smaller number of large pack files - more quickly. Smaller window sizes will negatively affect - performance due to increased calls to the operating system's - memory manager, but may improve performance when accessing - a large number of large pack files. -+ -Default is 1 MiB if NO_MMAP was set at compile time, otherwise 32 -MiB on 32 bit platforms and 1 GiB on 64 bit platforms. This should -be reasonable for all users/operating systems. You probably do -not need to adjust this value. -+ -Common unit suffixes of 'k', 'm', or 'g' are supported. - -core.packedGitLimit:: - Maximum number of bytes to map simultaneously into memory - from pack files. If Git needs to access more than this many - bytes at once to complete an operation it will unmap existing - regions to reclaim virtual address space within the process. -+ -Default is 256 MiB on 32 bit platforms and 32 TiB (effectively -unlimited) on 64 bit platforms. -This should be reasonable for all users/operating systems, except on -the largest projects. You probably do not need to adjust this value. -+ -Common unit suffixes of 'k', 'm', or 'g' are supported. - -core.deltaBaseCacheLimit:: - Maximum number of bytes to reserve for caching base objects - that may be referenced by multiple deltified objects. By storing the - entire decompressed base objects in a cache Git is able - to avoid unpacking and decompressing frequently used base - objects multiple times. -+ -Default is 96 MiB on all platforms. This should be reasonable -for all users/operating systems, except on the largest projects. -You probably do not need to adjust this value. -+ -Common unit suffixes of 'k', 'm', or 'g' are supported. - -core.bigFileThreshold:: - Files larger than this size are stored deflated, without - attempting delta compression. Storing large files without - delta compression avoids excessive memory usage, at the - slight expense of increased disk usage. Additionally files - larger than this size are always treated as binary. -+ -Default is 512 MiB on all platforms. This should be reasonable -for most projects as source code and other text files can still -be delta compressed, but larger binary media files won't be. -+ -Common unit suffixes of 'k', 'm', or 'g' are supported. - -core.excludesFile:: - Specifies the pathname to the file that contains patterns to - describe paths that are not meant to be tracked, in addition - to '.gitignore' (per-directory) and '.git/info/exclude'. - Defaults to `$XDG_CONFIG_HOME/git/ignore`. - If `$XDG_CONFIG_HOME` is either not set or empty, `$HOME/.config/git/ignore` - is used instead. See linkgit:gitignore[5]. - -core.askPass:: - Some commands (e.g. svn and http interfaces) that interactively - ask for a password can be told to use an external program given - via the value of this variable. Can be overridden by the `GIT_ASKPASS` - environment variable. If not set, fall back to the value of the - `SSH_ASKPASS` environment variable or, failing that, a simple password - prompt. The external program shall be given a suitable prompt as - command-line argument and write the password on its STDOUT. - -core.attributesFile:: - In addition to '.gitattributes' (per-directory) and - '.git/info/attributes', Git looks into this file for attributes - (see linkgit:gitattributes[5]). Path expansions are made the same - way as for `core.excludesFile`. Its default value is - `$XDG_CONFIG_HOME/git/attributes`. If `$XDG_CONFIG_HOME` is either not - set or empty, `$HOME/.config/git/attributes` is used instead. - -core.hooksPath:: - By default Git will look for your hooks in the - '$GIT_DIR/hooks' directory. Set this to different path, - e.g. '/etc/git/hooks', and Git will try to find your hooks in - that directory, e.g. '/etc/git/hooks/pre-receive' instead of - in '$GIT_DIR/hooks/pre-receive'. -+ -The path can be either absolute or relative. A relative path is -taken as relative to the directory where the hooks are run (see -the "DESCRIPTION" section of linkgit:githooks[5]). -+ -This configuration variable is useful in cases where you'd like to -centrally configure your Git hooks instead of configuring them on a -per-repository basis, or as a more flexible and centralized -alternative to having an `init.templateDir` where you've changed -default hooks. - -core.editor:: - Commands such as `commit` and `tag` that let you edit - messages by launching an editor use the value of this - variable when it is set, and the environment variable - `GIT_EDITOR` is not set. See linkgit:git-var[1]. - -core.commentChar:: - Commands such as `commit` and `tag` that let you edit - messages consider a line that begins with this character - commented, and removes them after the editor returns - (default '#'). -+ -If set to "auto", `git-commit` would select a character that is not -the beginning character of any line in existing commit messages. - -core.filesRefLockTimeout:: - The length of time, in milliseconds, to retry when trying to - lock an individual reference. Value 0 means not to retry at - all; -1 means to try indefinitely. Default is 100 (i.e., - retry for 100ms). - -core.packedRefsTimeout:: - The length of time, in milliseconds, to retry when trying to - lock the `packed-refs` file. Value 0 means not to retry at - all; -1 means to try indefinitely. Default is 1000 (i.e., - retry for 1 second). - -core.pager:: - Text viewer for use by Git commands (e.g., 'less'). The value - is meant to be interpreted by the shell. The order of preference - is the `$GIT_PAGER` environment variable, then `core.pager` - configuration, then `$PAGER`, and then the default chosen at - compile time (usually 'less'). -+ -When the `LESS` environment variable is unset, Git sets it to `FRX` -(if `LESS` environment variable is set, Git does not change it at -all). If you want to selectively override Git's default setting -for `LESS`, you can set `core.pager` to e.g. `less -S`. This will -be passed to the shell by Git, which will translate the final -command to `LESS=FRX less -S`. The environment does not set the -`S` option but the command line does, instructing less to truncate -long lines. Similarly, setting `core.pager` to `less -+F` will -deactivate the `F` option specified by the environment from the -command-line, deactivating the "quit if one screen" behavior of -`less`. One can specifically activate some flags for particular -commands: for example, setting `pager.blame` to `less -S` enables -line truncation only for `git blame`. -+ -Likewise, when the `LV` environment variable is unset, Git sets it -to `-c`. You can override this setting by exporting `LV` with -another value or setting `core.pager` to `lv +c`. - -core.whitespace:: - A comma separated list of common whitespace problems to - notice. 'git diff' will use `color.diff.whitespace` to - highlight them, and 'git apply --whitespace=error' will - consider them as errors. You can prefix `-` to disable - any of them (e.g. `-trailing-space`): -+ -* `blank-at-eol` treats trailing whitespaces at the end of the line - as an error (enabled by default). -* `space-before-tab` treats a space character that appears immediately - before a tab character in the initial indent part of the line as an - error (enabled by default). -* `indent-with-non-tab` treats a line that is indented with space - characters instead of the equivalent tabs as an error (not enabled by - default). -* `tab-in-indent` treats a tab character in the initial indent part of - the line as an error (not enabled by default). -* `blank-at-eof` treats blank lines added at the end of file as an error - (enabled by default). -* `trailing-space` is a short-hand to cover both `blank-at-eol` and - `blank-at-eof`. -* `cr-at-eol` treats a carriage-return at the end of line as - part of the line terminator, i.e. with it, `trailing-space` - does not trigger if the character before such a carriage-return - is not a whitespace (not enabled by default). -* `tabwidth=` tells how many character positions a tab occupies; this - is relevant for `indent-with-non-tab` and when Git fixes `tab-in-indent` - errors. The default tab width is 8. Allowed values are 1 to 63. - -core.fsyncObjectFiles:: - This boolean will enable 'fsync()' when writing object files. -+ -This is a total waste of time and effort on a filesystem that orders -data writes properly, but can be useful for filesystems that do not use -journalling (traditional UNIX filesystems) or that only journal metadata -and not file contents (OS X's HFS+, or Linux ext3 with "data=writeback"). - -core.preloadIndex:: - Enable parallel index preload for operations like 'git diff' -+ -This can speed up operations like 'git diff' and 'git status' especially -on filesystems like NFS that have weak caching semantics and thus -relatively high IO latencies. When enabled, Git will do the -index comparison to the filesystem data in parallel, allowing -overlapping IO's. Defaults to true. - -core.createObject:: - You can set this to 'link', in which case a hardlink followed by - a delete of the source are used to make sure that object creation - will not overwrite existing objects. -+ -On some file system/operating system combinations, this is unreliable. -Set this config setting to 'rename' there; However, This will remove the -check that makes sure that existing object files will not get overwritten. - -core.notesRef:: - When showing commit messages, also show notes which are stored in - the given ref. The ref must be fully qualified. If the given - ref does not exist, it is not an error but means that no - notes should be printed. -+ -This setting defaults to "refs/notes/commits", and it can be overridden by -the `GIT_NOTES_REF` environment variable. See linkgit:git-notes[1]. - -core.commitGraph:: - If true, then git will read the commit-graph file (if it exists) - to parse the graph structure of commits. Defaults to false. See - linkgit:git-commit-graph[1] for more information. - -core.useReplaceRefs:: - If set to `false`, behave as if the `--no-replace-objects` - option was given on the command line. See linkgit:git[1] and - linkgit:git-replace[1] for more information. - -core.multiPackIndex:: - Use the multi-pack-index file to track multiple packfiles using a - single index. See link:technical/multi-pack-index.html[the - multi-pack-index design document]. - -core.sparseCheckout:: - Enable "sparse checkout" feature. See section "Sparse checkout" in - linkgit:git-read-tree[1] for more information. - -core.abbrev:: - Set the length object names are abbreviated to. If - unspecified or set to "auto", an appropriate value is - computed based on the approximate number of packed objects - in your repository, which hopefully is enough for - abbreviated object names to stay unique for some time. - The minimum length is 4. +include::core-config.txt[] add.ignoreErrors:: add.ignore-errors (deprecated):: diff --git a/Documentation/core-config.txt b/Documentation/core-config.txt new file mode 100644 index 0000000000..73430b635b --- /dev/null +++ b/Documentation/core-config.txt @@ -0,0 +1,594 @@ +core.fileMode:: + Tells Git if the executable bit of files in the working tree + is to be honored. ++ +Some filesystems lose the executable bit when a file that is +marked as executable is checked out, or checks out a +non-executable file with executable bit on. +linkgit:git-clone[1] or linkgit:git-init[1] probe the filesystem +to see if it handles the executable bit correctly +and this variable is automatically set as necessary. ++ +A repository, however, may be on a filesystem that handles +the filemode correctly, and this variable is set to 'true' +when created, but later may be made accessible from another +environment that loses the filemode (e.g. exporting ext4 via +CIFS mount, visiting a Cygwin created repository with +Git for Windows or Eclipse). +In such a case it may be necessary to set this variable to 'false'. +See linkgit:git-update-index[1]. ++ +The default is true (when core.filemode is not specified in the config file). + +core.hideDotFiles:: + (Windows-only) If true, mark newly-created directories and files whose + name starts with a dot as hidden. If 'dotGitOnly', only the `.git/` + directory is hidden, but no other files starting with a dot. The + default mode is 'dotGitOnly'. + +core.ignoreCase:: + Internal variable which enables various workarounds to enable + Git to work better on filesystems that are not case sensitive, + like APFS, HFS+, FAT, NTFS, etc. For example, if a directory listing + finds "makefile" when Git expects "Makefile", Git will assume + it is really the same file, and continue to remember it as + "Makefile". ++ +The default is false, except linkgit:git-clone[1] or linkgit:git-init[1] +will probe and set core.ignoreCase true if appropriate when the repository +is created. ++ +Git relies on the proper configuration of this variable for your operating +and file system. Modifying this value may result in unexpected behavior. + +core.precomposeUnicode:: + This option is only used by Mac OS implementation of Git. + When core.precomposeUnicode=true, Git reverts the unicode decomposition + of filenames done by Mac OS. This is useful when sharing a repository + between Mac OS and Linux or Windows. + (Git for Windows 1.7.10 or higher is needed, or Git under cygwin 1.7). + When false, file names are handled fully transparent by Git, + which is backward compatible with older versions of Git. + +core.protectHFS:: + If set to true, do not allow checkout of paths that would + be considered equivalent to `.git` on an HFS+ filesystem. + Defaults to `true` on Mac OS, and `false` elsewhere. + +core.protectNTFS:: + If set to true, do not allow checkout of paths that would + cause problems with the NTFS filesystem, e.g. conflict with + 8.3 "short" names. + Defaults to `true` on Windows, and `false` elsewhere. + +core.fsmonitor:: + If set, the value of this variable is used as a command which + will identify all files that may have changed since the + requested date/time. This information is used to speed up git by + avoiding unnecessary processing of files that have not changed. + See the "fsmonitor-watchman" section of linkgit:githooks[5]. + +core.trustctime:: + If false, the ctime differences between the index and the + working tree are ignored; useful when the inode change time + is regularly modified by something outside Git (file system + crawlers and some backup systems). + See linkgit:git-update-index[1]. True by default. + +core.splitIndex:: + If true, the split-index feature of the index will be used. + See linkgit:git-update-index[1]. False by default. + +core.untrackedCache:: + Determines what to do about the untracked cache feature of the + index. It will be kept, if this variable is unset or set to + `keep`. It will automatically be added if set to `true`. And + it will automatically be removed, if set to `false`. Before + setting it to `true`, you should check that mtime is working + properly on your system. + See linkgit:git-update-index[1]. `keep` by default. + +core.checkStat:: + When missing or is set to `default`, many fields in the stat + structure are checked to detect if a file has been modified + since Git looked at it. When this configuration variable is + set to `minimal`, sub-second part of mtime and ctime, the + uid and gid of the owner of the file, the inode number (and + the device number, if Git was compiled to use it), are + excluded from the check among these fields, leaving only the + whole-second part of mtime (and ctime, if `core.trustCtime` + is set) and the filesize to be checked. ++ +There are implementations of Git that do not leave usable values in +some fields (e.g. JGit); by excluding these fields from the +comparison, the `minimal` mode may help interoperability when the +same repository is used by these other systems at the same time. + +core.quotePath:: + Commands that output paths (e.g. 'ls-files', 'diff'), will + quote "unusual" characters in the pathname by enclosing the + pathname in double-quotes and escaping those characters with + backslashes in the same way C escapes control characters (e.g. + `\t` for TAB, `\n` for LF, `\\` for backslash) or bytes with + values larger than 0x80 (e.g. octal `\302\265` for "micro" in + UTF-8). If this variable is set to false, bytes higher than + 0x80 are not considered "unusual" any more. Double-quotes, + backslash and control characters are always escaped regardless + of the setting of this variable. A simple space character is + not considered "unusual". Many commands can output pathnames + completely verbatim using the `-z` option. The default value + is true. + +core.eol:: + Sets the line ending type to use in the working directory for + files that have the `text` property set when core.autocrlf is false. + Alternatives are 'lf', 'crlf' and 'native', which uses the platform's + native line ending. The default value is `native`. See + linkgit:gitattributes[5] for more information on end-of-line + conversion. + +core.safecrlf:: + If true, makes Git check if converting `CRLF` is reversible when + end-of-line conversion is active. Git will verify if a command + modifies a file in the work tree either directly or indirectly. + For example, committing a file followed by checking out the + same file should yield the original file in the work tree. If + this is not the case for the current setting of + `core.autocrlf`, Git will reject the file. The variable can + be set to "warn", in which case Git will only warn about an + irreversible conversion but continue the operation. ++ +CRLF conversion bears a slight chance of corrupting data. +When it is enabled, Git will convert CRLF to LF during commit and LF to +CRLF during checkout. A file that contains a mixture of LF and +CRLF before the commit cannot be recreated by Git. For text +files this is the right thing to do: it corrects line endings +such that we have only LF line endings in the repository. +But for binary files that are accidentally classified as text the +conversion can corrupt data. ++ +If you recognize such corruption early you can easily fix it by +setting the conversion type explicitly in .gitattributes. Right +after committing you still have the original file in your work +tree and this file is not yet corrupted. You can explicitly tell +Git that this file is binary and Git will handle the file +appropriately. ++ +Unfortunately, the desired effect of cleaning up text files with +mixed line endings and the undesired effect of corrupting binary +files cannot be distinguished. In both cases CRLFs are removed +in an irreversible way. For text files this is the right thing +to do because CRLFs are line endings, while for binary files +converting CRLFs corrupts data. ++ +Note, this safety check does not mean that a checkout will generate a +file identical to the original file for a different setting of +`core.eol` and `core.autocrlf`, but only for the current one. For +example, a text file with `LF` would be accepted with `core.eol=lf` +and could later be checked out with `core.eol=crlf`, in which case the +resulting file would contain `CRLF`, although the original file +contained `LF`. However, in both work trees the line endings would be +consistent, that is either all `LF` or all `CRLF`, but never mixed. A +file with mixed line endings would be reported by the `core.safecrlf` +mechanism. + +core.autocrlf:: + Setting this variable to "true" is the same as setting + the `text` attribute to "auto" on all files and core.eol to "crlf". + Set to true if you want to have `CRLF` line endings in your + working directory and the repository has LF line endings. + This variable can be set to 'input', + in which case no output conversion is performed. + +core.checkRoundtripEncoding:: + A comma and/or whitespace separated list of encodings that Git + performs UTF-8 round trip checks on if they are used in an + `working-tree-encoding` attribute (see linkgit:gitattributes[5]). + The default value is `SHIFT-JIS`. + +core.symlinks:: + If false, symbolic links are checked out as small plain files that + contain the link text. linkgit:git-update-index[1] and + linkgit:git-add[1] will not change the recorded type to regular + file. Useful on filesystems like FAT that do not support + symbolic links. ++ +The default is true, except linkgit:git-clone[1] or linkgit:git-init[1] +will probe and set core.symlinks false if appropriate when the repository +is created. + +core.gitProxy:: + A "proxy command" to execute (as 'command host port') instead + of establishing direct connection to the remote server when + using the Git protocol for fetching. If the variable value is + in the "COMMAND for DOMAIN" format, the command is applied only + on hostnames ending with the specified domain string. This variable + may be set multiple times and is matched in the given order; + the first match wins. ++ +Can be overridden by the `GIT_PROXY_COMMAND` environment variable +(which always applies universally, without the special "for" +handling). ++ +The special string `none` can be used as the proxy command to +specify that no proxy be used for a given domain pattern. +This is useful for excluding servers inside a firewall from +proxy use, while defaulting to a common proxy for external domains. + +core.sshCommand:: + If this variable is set, `git fetch` and `git push` will + use the specified command instead of `ssh` when they need to + connect to a remote system. The command is in the same form as + the `GIT_SSH_COMMAND` environment variable and is overridden + when the environment variable is set. + +core.ignoreStat:: + If true, Git will avoid using lstat() calls to detect if files have + changed by setting the "assume-unchanged" bit for those tracked files + which it has updated identically in both the index and working tree. ++ +When files are modified outside of Git, the user will need to stage +the modified files explicitly (e.g. see 'Examples' section in +linkgit:git-update-index[1]). +Git will not normally detect changes to those files. ++ +This is useful on systems where lstat() calls are very slow, such as +CIFS/Microsoft Windows. ++ +False by default. + +core.preferSymlinkRefs:: + Instead of the default "symref" format for HEAD + and other symbolic reference files, use symbolic links. + This is sometimes needed to work with old scripts that + expect HEAD to be a symbolic link. + +core.alternateRefsCommand:: + When advertising tips of available history from an alternate, use the shell to + execute the specified command instead of linkgit:git-for-each-ref[1]. The + first argument is the absolute path of the alternate. Output must contain one + hex object id per line (i.e., the same as produce by `git for-each-ref + --format='%(objectname)'`). ++ +Note that you cannot generally put `git for-each-ref` directly into the config +value, as it does not take a repository path as an argument (but you can wrap +the command above in a shell script). + +core.alternateRefsPrefixes:: + When listing references from an alternate, list only references that begin + with the given prefix. Prefixes match as if they were given as arguments to + linkgit:git-for-each-ref[1]. To list multiple prefixes, separate them with + whitespace. If `core.alternateRefsCommand` is set, setting + `core.alternateRefsPrefixes` has no effect. + +core.bare:: + If true this repository is assumed to be 'bare' and has no + working directory associated with it. If this is the case a + number of commands that require a working directory will be + disabled, such as linkgit:git-add[1] or linkgit:git-merge[1]. ++ +This setting is automatically guessed by linkgit:git-clone[1] or +linkgit:git-init[1] when the repository was created. By default a +repository that ends in "/.git" is assumed to be not bare (bare = +false), while all other repositories are assumed to be bare (bare += true). + +core.worktree:: + Set the path to the root of the working tree. + If `GIT_COMMON_DIR` environment variable is set, core.worktree + is ignored and not used for determining the root of working tree. + This can be overridden by the `GIT_WORK_TREE` environment + variable and the `--work-tree` command-line option. + The value can be an absolute path or relative to the path to + the .git directory, which is either specified by --git-dir + or GIT_DIR, or automatically discovered. + If --git-dir or GIT_DIR is specified but none of + --work-tree, GIT_WORK_TREE and core.worktree is specified, + the current working directory is regarded as the top level + of your working tree. ++ +Note that this variable is honored even when set in a configuration +file in a ".git" subdirectory of a directory and its value differs +from the latter directory (e.g. "/path/to/.git/config" has +core.worktree set to "/different/path"), which is most likely a +misconfiguration. Running Git commands in the "/path/to" directory will +still use "/different/path" as the root of the work tree and can cause +confusion unless you know what you are doing (e.g. you are creating a +read-only snapshot of the same index to a location different from the +repository's usual working tree). + +core.logAllRefUpdates:: + Enable the reflog. Updates to a ref is logged to the file + "`$GIT_DIR/logs/`", by appending the new and old + SHA-1, the date/time and the reason of the update, but + only when the file exists. If this configuration + variable is set to `true`, missing "`$GIT_DIR/logs/`" + file is automatically created for branch heads (i.e. under + `refs/heads/`), remote refs (i.e. under `refs/remotes/`), + note refs (i.e. under `refs/notes/`), and the symbolic ref `HEAD`. + If it is set to `always`, then a missing reflog is automatically + created for any ref under `refs/`. ++ +This information can be used to determine what commit +was the tip of a branch "2 days ago". ++ +This value is true by default in a repository that has +a working directory associated with it, and false by +default in a bare repository. + +core.repositoryFormatVersion:: + Internal variable identifying the repository format and layout + version. + +core.sharedRepository:: + When 'group' (or 'true'), the repository is made shareable between + several users in a group (making sure all the files and objects are + group-writable). When 'all' (or 'world' or 'everybody'), the + repository will be readable by all users, additionally to being + group-shareable. When 'umask' (or 'false'), Git will use permissions + reported by umask(2). When '0xxx', where '0xxx' is an octal number, + files in the repository will have this mode value. '0xxx' will override + user's umask value (whereas the other options will only override + requested parts of the user's umask value). Examples: '0660' will make + the repo read/write-able for the owner and group, but inaccessible to + others (equivalent to 'group' unless umask is e.g. '0022'). '0640' is a + repository that is group-readable but not group-writable. + See linkgit:git-init[1]. False by default. + +core.warnAmbiguousRefs:: + If true, Git will warn you if the ref name you passed it is ambiguous + and might match multiple refs in the repository. True by default. + +core.compression:: + An integer -1..9, indicating a default compression level. + -1 is the zlib default. 0 means no compression, + and 1..9 are various speed/size tradeoffs, 9 being slowest. + If set, this provides a default to other compression variables, + such as `core.looseCompression` and `pack.compression`. + +core.looseCompression:: + An integer -1..9, indicating the compression level for objects that + are not in a pack file. -1 is the zlib default. 0 means no + compression, and 1..9 are various speed/size tradeoffs, 9 being + slowest. If not set, defaults to core.compression. If that is + not set, defaults to 1 (best speed). + +core.packedGitWindowSize:: + Number of bytes of a pack file to map into memory in a + single mapping operation. Larger window sizes may allow + your system to process a smaller number of large pack files + more quickly. Smaller window sizes will negatively affect + performance due to increased calls to the operating system's + memory manager, but may improve performance when accessing + a large number of large pack files. ++ +Default is 1 MiB if NO_MMAP was set at compile time, otherwise 32 +MiB on 32 bit platforms and 1 GiB on 64 bit platforms. This should +be reasonable for all users/operating systems. You probably do +not need to adjust this value. ++ +Common unit suffixes of 'k', 'm', or 'g' are supported. + +core.packedGitLimit:: + Maximum number of bytes to map simultaneously into memory + from pack files. If Git needs to access more than this many + bytes at once to complete an operation it will unmap existing + regions to reclaim virtual address space within the process. ++ +Default is 256 MiB on 32 bit platforms and 32 TiB (effectively +unlimited) on 64 bit platforms. +This should be reasonable for all users/operating systems, except on +the largest projects. You probably do not need to adjust this value. ++ +Common unit suffixes of 'k', 'm', or 'g' are supported. + +core.deltaBaseCacheLimit:: + Maximum number of bytes to reserve for caching base objects + that may be referenced by multiple deltified objects. By storing the + entire decompressed base objects in a cache Git is able + to avoid unpacking and decompressing frequently used base + objects multiple times. ++ +Default is 96 MiB on all platforms. This should be reasonable +for all users/operating systems, except on the largest projects. +You probably do not need to adjust this value. ++ +Common unit suffixes of 'k', 'm', or 'g' are supported. + +core.bigFileThreshold:: + Files larger than this size are stored deflated, without + attempting delta compression. Storing large files without + delta compression avoids excessive memory usage, at the + slight expense of increased disk usage. Additionally files + larger than this size are always treated as binary. ++ +Default is 512 MiB on all platforms. This should be reasonable +for most projects as source code and other text files can still +be delta compressed, but larger binary media files won't be. ++ +Common unit suffixes of 'k', 'm', or 'g' are supported. + +core.excludesFile:: + Specifies the pathname to the file that contains patterns to + describe paths that are not meant to be tracked, in addition + to '.gitignore' (per-directory) and '.git/info/exclude'. + Defaults to `$XDG_CONFIG_HOME/git/ignore`. + If `$XDG_CONFIG_HOME` is either not set or empty, `$HOME/.config/git/ignore` + is used instead. See linkgit:gitignore[5]. + +core.askPass:: + Some commands (e.g. svn and http interfaces) that interactively + ask for a password can be told to use an external program given + via the value of this variable. Can be overridden by the `GIT_ASKPASS` + environment variable. If not set, fall back to the value of the + `SSH_ASKPASS` environment variable or, failing that, a simple password + prompt. The external program shall be given a suitable prompt as + command-line argument and write the password on its STDOUT. + +core.attributesFile:: + In addition to '.gitattributes' (per-directory) and + '.git/info/attributes', Git looks into this file for attributes + (see linkgit:gitattributes[5]). Path expansions are made the same + way as for `core.excludesFile`. Its default value is + `$XDG_CONFIG_HOME/git/attributes`. If `$XDG_CONFIG_HOME` is either not + set or empty, `$HOME/.config/git/attributes` is used instead. + +core.hooksPath:: + By default Git will look for your hooks in the + '$GIT_DIR/hooks' directory. Set this to different path, + e.g. '/etc/git/hooks', and Git will try to find your hooks in + that directory, e.g. '/etc/git/hooks/pre-receive' instead of + in '$GIT_DIR/hooks/pre-receive'. ++ +The path can be either absolute or relative. A relative path is +taken as relative to the directory where the hooks are run (see +the "DESCRIPTION" section of linkgit:githooks[5]). ++ +This configuration variable is useful in cases where you'd like to +centrally configure your Git hooks instead of configuring them on a +per-repository basis, or as a more flexible and centralized +alternative to having an `init.templateDir` where you've changed +default hooks. + +core.editor:: + Commands such as `commit` and `tag` that let you edit + messages by launching an editor use the value of this + variable when it is set, and the environment variable + `GIT_EDITOR` is not set. See linkgit:git-var[1]. + +core.commentChar:: + Commands such as `commit` and `tag` that let you edit + messages consider a line that begins with this character + commented, and removes them after the editor returns + (default '#'). ++ +If set to "auto", `git-commit` would select a character that is not +the beginning character of any line in existing commit messages. + +core.filesRefLockTimeout:: + The length of time, in milliseconds, to retry when trying to + lock an individual reference. Value 0 means not to retry at + all; -1 means to try indefinitely. Default is 100 (i.e., + retry for 100ms). + +core.packedRefsTimeout:: + The length of time, in milliseconds, to retry when trying to + lock the `packed-refs` file. Value 0 means not to retry at + all; -1 means to try indefinitely. Default is 1000 (i.e., + retry for 1 second). + +core.pager:: + Text viewer for use by Git commands (e.g., 'less'). The value + is meant to be interpreted by the shell. The order of preference + is the `$GIT_PAGER` environment variable, then `core.pager` + configuration, then `$PAGER`, and then the default chosen at + compile time (usually 'less'). ++ +When the `LESS` environment variable is unset, Git sets it to `FRX` +(if `LESS` environment variable is set, Git does not change it at +all). If you want to selectively override Git's default setting +for `LESS`, you can set `core.pager` to e.g. `less -S`. This will +be passed to the shell by Git, which will translate the final +command to `LESS=FRX less -S`. The environment does not set the +`S` option but the command line does, instructing less to truncate +long lines. Similarly, setting `core.pager` to `less -+F` will +deactivate the `F` option specified by the environment from the +command-line, deactivating the "quit if one screen" behavior of +`less`. One can specifically activate some flags for particular +commands: for example, setting `pager.blame` to `less -S` enables +line truncation only for `git blame`. ++ +Likewise, when the `LV` environment variable is unset, Git sets it +to `-c`. You can override this setting by exporting `LV` with +another value or setting `core.pager` to `lv +c`. + +core.whitespace:: + A comma separated list of common whitespace problems to + notice. 'git diff' will use `color.diff.whitespace` to + highlight them, and 'git apply --whitespace=error' will + consider them as errors. You can prefix `-` to disable + any of them (e.g. `-trailing-space`): ++ +* `blank-at-eol` treats trailing whitespaces at the end of the line + as an error (enabled by default). +* `space-before-tab` treats a space character that appears immediately + before a tab character in the initial indent part of the line as an + error (enabled by default). +* `indent-with-non-tab` treats a line that is indented with space + characters instead of the equivalent tabs as an error (not enabled by + default). +* `tab-in-indent` treats a tab character in the initial indent part of + the line as an error (not enabled by default). +* `blank-at-eof` treats blank lines added at the end of file as an error + (enabled by default). +* `trailing-space` is a short-hand to cover both `blank-at-eol` and + `blank-at-eof`. +* `cr-at-eol` treats a carriage-return at the end of line as + part of the line terminator, i.e. with it, `trailing-space` + does not trigger if the character before such a carriage-return + is not a whitespace (not enabled by default). +* `tabwidth=` tells how many character positions a tab occupies; this + is relevant for `indent-with-non-tab` and when Git fixes `tab-in-indent` + errors. The default tab width is 8. Allowed values are 1 to 63. + +core.fsyncObjectFiles:: + This boolean will enable 'fsync()' when writing object files. ++ +This is a total waste of time and effort on a filesystem that orders +data writes properly, but can be useful for filesystems that do not use +journalling (traditional UNIX filesystems) or that only journal metadata +and not file contents (OS X's HFS+, or Linux ext3 with "data=writeback"). + +core.preloadIndex:: + Enable parallel index preload for operations like 'git diff' ++ +This can speed up operations like 'git diff' and 'git status' especially +on filesystems like NFS that have weak caching semantics and thus +relatively high IO latencies. When enabled, Git will do the +index comparison to the filesystem data in parallel, allowing +overlapping IO's. Defaults to true. + +core.createObject:: + You can set this to 'link', in which case a hardlink followed by + a delete of the source are used to make sure that object creation + will not overwrite existing objects. ++ +On some file system/operating system combinations, this is unreliable. +Set this config setting to 'rename' there; However, This will remove the +check that makes sure that existing object files will not get overwritten. + +core.notesRef:: + When showing commit messages, also show notes which are stored in + the given ref. The ref must be fully qualified. If the given + ref does not exist, it is not an error but means that no + notes should be printed. ++ +This setting defaults to "refs/notes/commits", and it can be overridden by +the `GIT_NOTES_REF` environment variable. See linkgit:git-notes[1]. + +core.commitGraph:: + If true, then git will read the commit-graph file (if it exists) + to parse the graph structure of commits. Defaults to false. See + linkgit:git-commit-graph[1] for more information. + +core.useReplaceRefs:: + If set to `false`, behave as if the `--no-replace-objects` + option was given on the command line. See linkgit:git[1] and + linkgit:git-replace[1] for more information. + +core.multiPackIndex:: + Use the multi-pack-index file to track multiple packfiles using a + single index. See link:technical/multi-pack-index.html[the + multi-pack-index design document]. + +core.sparseCheckout:: + Enable "sparse checkout" feature. See section "Sparse checkout" in + linkgit:git-read-tree[1] for more information. + +core.abbrev:: + Set the length object names are abbreviated to. If + unspecified or set to "auto", an appropriate value is + computed based on the approximate number of packed objects + in your repository, which hopefully is enough for + abbreviated object names to stay unique for some time. + The minimum length is 4. From patchwork Sat Oct 20 12:37:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650401 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 A541A17D4 for ; Sat, 20 Oct 2018 12:39:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 918582863E for ; Sat, 20 Oct 2018 12:39:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 844882863B; Sat, 20 Oct 2018 12:39:12 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 5274528620 for ; Sat, 20 Oct 2018 12:39:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727404AbeJTUtW (ORCPT ); Sat, 20 Oct 2018 16:49:22 -0400 Received: from mail-lj1-f194.google.com ([209.85.208.194]:33752 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727373AbeJTUtW (ORCPT ); Sat, 20 Oct 2018 16:49:22 -0400 Received: by mail-lj1-f194.google.com with SMTP id z21-v6so33116305ljz.0 for ; Sat, 20 Oct 2018 05:39:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2Ja8PnU4Om1g8Sx87JWGnV/62NoNyi17LQFMlVabGW0=; b=R1UWitg+EJUHjfNeipmPLw4fq4CEap3MXI4X4NobIi6mWCGBMX2vyaO0hHpusR/Rl7 e8griYTvzsONTRB0UfUD34k7PlOa+PyH1AQKEmGfTmn/3pAmm/5wTxfmnbggQ9weDZDf YuhlHVMNDKeBuab0mxb9MmvvM91VNcuRrShM/pucRIfrx2Tvxb1jgdJNzS8yy380hX8C iNqngXtYliTR+ZesNEM57SDAKPV1vJNXsFi1vb2kdpq8Nu1W1XSphs2fMiuT14GRRq1b Na2qXduzNxVVB4jqtvuDygUXgDTcm+P2/MQ9zP6Lz7Hsa4cuC9tNRET41h+jBft1B/Zh 8fEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2Ja8PnU4Om1g8Sx87JWGnV/62NoNyi17LQFMlVabGW0=; b=XkDF9Zq5g/Z1/Xam6KoPqe5UBcTeWiwmWWgXsY+eX7Qq6Ymrj8JN1ddiOoJnHPe2a2 9ydrCkign0NkFYZG5wPGWmaMZQ/NP2iVC90q3GfhDDq+9tHMrsqZmG+Yb7E52zVfWQHM 3WweUoj5sBm9lmWVvk4CZgXOLjoStrkpbpeUa4jncaNxzs8oaPgK7Y3hhil2WW+sKR25 1CxSBb7S6+z1mt5xUl4zOhDlR4lyR04OAEIWoENtFr802Q0/5s41JaCC1ptCMII29JLX 0N/CHVx8itXUHdEHPUxqxlLitwTF/jJrGK2J//iTEmUTra1TX5931o/LCdm+Dj2s6SDW lN4w== X-Gm-Message-State: ABuFfogrVSK+5BvlHtmNAKYXlCykFGgfYNAXnZ+nnj+oFlr9EBDsnEnq s9Ll1i0d9hg/5uPeiKnzBVSRgHWP X-Google-Smtp-Source: ACcGV63LRVZX3tzJD/hl5GvUVFELYRc/oaicTIbecRRShkVvfegqvYyeHLpPy4BFNtfkb+lv0sCWoA== X-Received: by 2002:a2e:84c5:: with SMTP id q5-v6mr13589311ljh.65.1540039139923; Sat, 20 Oct 2018 05:38:59 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.38.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:38:59 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 03/59] config.txt: move add.* to a separate file Date: Sat, 20 Oct 2018 14:37:52 +0200 Message-Id: <20181020123848.2785-4-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/add-config.txt | 7 +++++++ Documentation/config.txt | 8 +------- 2 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 Documentation/add-config.txt diff --git a/Documentation/add-config.txt b/Documentation/add-config.txt new file mode 100644 index 0000000000..4d753f006e --- /dev/null +++ b/Documentation/add-config.txt @@ -0,0 +1,7 @@ +add.ignoreErrors:: +add.ignore-errors (deprecated):: + Tells 'git add' to continue adding files when some files cannot be + added due to indexing errors. Equivalent to the `--ignore-errors` + option of linkgit:git-add[1]. `add.ignore-errors` is deprecated, + as it does not follow the usual naming convention for configuration + variables. diff --git a/Documentation/config.txt b/Documentation/config.txt index 27c2a211c0..a52e0b3592 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -291,13 +291,7 @@ include::advice-config.txt[] include::core-config.txt[] -add.ignoreErrors:: -add.ignore-errors (deprecated):: - Tells 'git add' to continue adding files when some files cannot be - added due to indexing errors. Equivalent to the `--ignore-errors` - option of linkgit:git-add[1]. `add.ignore-errors` is deprecated, - as it does not follow the usual naming convention for configuration - variables. +include::add-config.txt[] alias.*:: Command aliases for the linkgit:git[1] command wrapper - e.g. From patchwork Sat Oct 20 12:37:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650409 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 4F11A3E9D for ; Sat, 20 Oct 2018 12:39:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 372E128620 for ; Sat, 20 Oct 2018 12:39:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2BFFC28627; Sat, 20 Oct 2018 12:39:13 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 73BB428623 for ; Sat, 20 Oct 2018 12:39:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727430AbeJTUtX (ORCPT ); Sat, 20 Oct 2018 16:49:23 -0400 Received: from mail-lj1-f194.google.com ([209.85.208.194]:44777 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727382AbeJTUtX (ORCPT ); Sat, 20 Oct 2018 16:49:23 -0400 Received: by mail-lj1-f194.google.com with SMTP id v6-v6so33057915ljc.11 for ; Sat, 20 Oct 2018 05:39:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gFRP4rtb7lqT/qAET2p1hdlIVKin8ebEJAL50hZPLVY=; b=s3InJy9wyFSdvC6yLIf5ybvtrT2nDFqYflwTeE8aTyFDzl++a8Me296P3kxzQmkiKO k7ArGxfWOp3XMAYuYrCgcMT0aOq1UONKLOV6ZolCOO4HgzQN4myGb3twMUqOGwmhpUFQ 3tMH/XwhaOF0Bt2ltGwp9sMJ01S1eRizYcE/OZn2P/Ssjzb+qLRI3zP/N9E+Cz19uguz h5BBsVEysAZxHrpAJn7T+gyF0aEUk/Y/RIb0bwMZ1sYFsB0nc7QdEcnffnhHJTpQui25 /mlwBtwUMigsNHWowVHI+D/oGB57h4hjnBCOnMXZwE59O0jII6CAkalwN7+6jSpdhVnl Ze2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gFRP4rtb7lqT/qAET2p1hdlIVKin8ebEJAL50hZPLVY=; b=uD03nK69NsJvWezn36lQH2HLLB8TsABh8ftaMk6rkjpksM/PTtowopNUb+jlfdZcHW J4ASqNvz9d8AD3u7L8A9bF51JQIrbkDvEj1gFnW9v1id4fG3Hdf3yEVtM5rsuPCLc6sF ptYn2AJPg3lt+Gl8Odtr6sENRPexM4cUQMNg5s2Zu1ViBqDUGvNlTbnTW9pR885aGK9H VxHC0+OgYundiXRD8Jr/BarpYRlsqTzAJB462NesR8JS4+vOJImKaRU4CO+ZQqdWf/OG TK8ffMUWOYTNlZjwW2AjKvYI1boZ7Mc5mLL9z2kcw19Z3pLeOtlPC6iBSh77nKI2FpYy QVOg== X-Gm-Message-State: AGRZ1gIUyPLvvNhFcVm8bpL+fvb01dMAmDC3lz7I5QRDYAk3XE08KMKW hteWsWWKaIdEHEG4VDbaix1B9Xgi X-Google-Smtp-Source: AJdET5dWZU/HMVjUYKEgn4tOe3kXFB6mW3LNGZ40ihihq7GxVpORDpEco91qY/n7RZTf+IB12g9jEA== X-Received: by 2002:a2e:9b04:: with SMTP id u4-v6mr6323450lji.29.1540039141039; Sat, 20 Oct 2018 05:39:01 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.38.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:00 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 04/59] config.txt: move alias.* to a separate file Date: Sat, 20 Oct 2018 14:37:53 +0200 Message-Id: <20181020123848.2785-5-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/alias-config.txt | 18 ++++++++++++++++++ Documentation/config.txt | 19 +------------------ 2 files changed, 19 insertions(+), 18 deletions(-) create mode 100644 Documentation/alias-config.txt diff --git a/Documentation/alias-config.txt b/Documentation/alias-config.txt new file mode 100644 index 0000000000..0b14178314 --- /dev/null +++ b/Documentation/alias-config.txt @@ -0,0 +1,18 @@ +alias.*:: + Command aliases for the linkgit:git[1] command wrapper - e.g. + after defining "alias.last = cat-file commit HEAD", the invocation + "git last" is equivalent to "git cat-file commit HEAD". To avoid + confusion and troubles with script usage, aliases that + hide existing Git commands are ignored. Arguments are split by + spaces, the usual shell quoting and escaping is supported. + A quote pair or a backslash can be used to quote them. ++ +If the alias expansion is prefixed with an exclamation point, +it will be treated as a shell command. For example, defining +"alias.new = !gitk --all --not ORIG_HEAD", the invocation +"git new" is equivalent to running the shell command +"gitk --all --not ORIG_HEAD". Note that shell commands will be +executed from the top-level directory of a repository, which may +not necessarily be the current directory. +`GIT_PREFIX` is set as returned by running 'git rev-parse --show-prefix' +from the original current directory. See linkgit:git-rev-parse[1]. diff --git a/Documentation/config.txt b/Documentation/config.txt index a52e0b3592..5b46310dd4 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -293,24 +293,7 @@ include::core-config.txt[] include::add-config.txt[] -alias.*:: - Command aliases for the linkgit:git[1] command wrapper - e.g. - after defining "alias.last = cat-file commit HEAD", the invocation - "git last" is equivalent to "git cat-file commit HEAD". To avoid - confusion and troubles with script usage, aliases that - hide existing Git commands are ignored. Arguments are split by - spaces, the usual shell quoting and escaping is supported. - A quote pair or a backslash can be used to quote them. -+ -If the alias expansion is prefixed with an exclamation point, -it will be treated as a shell command. For example, defining -"alias.new = !gitk --all --not ORIG_HEAD", the invocation -"git new" is equivalent to running the shell command -"gitk --all --not ORIG_HEAD". Note that shell commands will be -executed from the top-level directory of a repository, which may -not necessarily be the current directory. -`GIT_PREFIX` is set as returned by running 'git rev-parse --show-prefix' -from the original current directory. See linkgit:git-rev-parse[1]. +include::alias-config.txt[] am.keepcr:: If true, git-am will call git-mailsplit for patches in mbox format From patchwork Sat Oct 20 12:37:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650405 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 BC419112B for ; Sat, 20 Oct 2018 12:39:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A81D128620 for ; Sat, 20 Oct 2018 12:39:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 978D528630; Sat, 20 Oct 2018 12:39:12 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 93FFF28627 for ; Sat, 20 Oct 2018 12:39:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727449AbeJTUtY (ORCPT ); Sat, 20 Oct 2018 16:49:24 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:35823 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727373AbeJTUtY (ORCPT ); Sat, 20 Oct 2018 16:49:24 -0400 Received: by mail-lj1-f193.google.com with SMTP id o14-v6so33123351ljj.2 for ; Sat, 20 Oct 2018 05:39:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=O/l2rnaRHIUY8ml5xzAxdlXbT1eyT0Ej/FGcY6v3eMc=; b=WKFKsfmchgjnKdIXLGQsv+3axYEz9cQW0k5gy0cRLvW/Br2HkD9GvWoS2lxCR5CMXg IJW4tcDP4rYMIG5IXoiEeGaSI4GkbJnc3bvjO/nrNrotDqZXIx/l8PVifeb46khbh+9V 3giltnFbqYC53pgX6vMsi+YiMg/uvO0GiDOe7S+uQKjiqGzaP0eKGEkcGYa5ne5y9oO+ pOriyQHDoTbA9e7Cs4coiBPIVp4GPPUFqXytLrEOjyj9BoNNh/Bwu4LibzkA9G4xuE7T WvD0xDtL5t2NIMBalODlATAmbEWn7j3iOia9zsU8bbv3uKbHU6Xe7tUaeyqWgnbPtaDL 9HRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=O/l2rnaRHIUY8ml5xzAxdlXbT1eyT0Ej/FGcY6v3eMc=; b=VXnwffFAGkSLOi1JEZNrjzJvc3cx5iLx4U5L2rjZyunvsnmZtBigVQM1n3z97KFKt/ qKwBUXW0mryRH8kJhzux1Y1h8o9ooRC/IcCD8pJ4QINHVvP9HYr7LqL3gd97FoGXaUOk 0S/YeS0yZ6ZhdD0+e/w+7OZZ7DWpKBDOi29jKVUO09kaWdOwAKrx+JWbu3Z9tDPgkGH5 ge2S3aA0jGxHZWkjK84ONXyvjwca+ziEkpgZajnNeLBZZvev89c+dz+5MdAraduwvQfw ++eM+PxFLyslrsoqfldLFaFBIBGsnpOEqP00oqAdT2pizVWckcvU3ecOLpVk5eMlFQOg Ph3w== X-Gm-Message-State: ABuFfojXQ9qUvy1vFtt7CDhx7NZu2JZDK5v7Az7V0Pa+G8Ayai4SuXc3 yQQZ/sIhiTXLu/XJcKIqNuetJ/iD X-Google-Smtp-Source: ACcGV61EapTF0SkR5fC/MzZ8wUDRt1Mvgz4p7G5wuAO7sgKQUneTpaQAJwJ9p/sHs1b5aaBpoQ3yvQ== X-Received: by 2002:a2e:980f:: with SMTP id a15-v6mr27846265ljj.6.1540039142135; Sat, 20 Oct 2018 05:39:02 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:01 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 05/59] config.txt: move am.* to a separate file Date: Sat, 20 Oct 2018 14:37:54 +0200 Message-Id: <20181020123848.2785-6-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/am-config.txt | 14 ++++++++++++++ Documentation/config.txt | 15 +-------------- 2 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 Documentation/am-config.txt diff --git a/Documentation/am-config.txt b/Documentation/am-config.txt new file mode 100644 index 0000000000..5bcad2efb1 --- /dev/null +++ b/Documentation/am-config.txt @@ -0,0 +1,14 @@ +am.keepcr:: + If true, git-am will call git-mailsplit for patches in mbox format + with parameter `--keep-cr`. In this case git-mailsplit will + not remove `\r` from lines ending with `\r\n`. Can be overridden + by giving `--no-keep-cr` from the command line. + See linkgit:git-am[1], linkgit:git-mailsplit[1]. + +am.threeWay:: + By default, `git am` will fail if the patch does not apply cleanly. When + set to true, this setting tells `git am` to fall back on 3-way merge if + the patch records the identity of blobs it is supposed to apply to and + we have those blobs available locally (equivalent to giving the `--3way` + option from the command line). Defaults to `false`. + See linkgit:git-am[1]. diff --git a/Documentation/config.txt b/Documentation/config.txt index 5b46310dd4..29dd694438 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -295,20 +295,7 @@ include::add-config.txt[] include::alias-config.txt[] -am.keepcr:: - If true, git-am will call git-mailsplit for patches in mbox format - with parameter `--keep-cr`. In this case git-mailsplit will - not remove `\r` from lines ending with `\r\n`. Can be overridden - by giving `--no-keep-cr` from the command line. - See linkgit:git-am[1], linkgit:git-mailsplit[1]. - -am.threeWay:: - By default, `git am` will fail if the patch does not apply cleanly. When - set to true, this setting tells `git am` to fall back on 3-way merge if - the patch records the identity of blobs it is supposed to apply to and - we have those blobs available locally (equivalent to giving the `--3way` - option from the command line). Defaults to `false`. - See linkgit:git-am[1]. +include::am-config.txt[] apply.ignoreWhitespace:: When set to 'change', tells 'git apply' to ignore changes in From patchwork Sat Oct 20 12:37:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650415 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 A2807112B for ; Sat, 20 Oct 2018 12:39:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8AB4C28620 for ; Sat, 20 Oct 2018 12:39:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7EB842861E; Sat, 20 Oct 2018 12:39:13 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 B8B4C28628 for ; Sat, 20 Oct 2018 12:39:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727459AbeJTUtZ (ORCPT ); Sat, 20 Oct 2018 16:49:25 -0400 Received: from mail-lj1-f194.google.com ([209.85.208.194]:37844 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727382AbeJTUtZ (ORCPT ); Sat, 20 Oct 2018 16:49:25 -0400 Received: by mail-lj1-f194.google.com with SMTP id 63-v6so33121598ljs.4 for ; Sat, 20 Oct 2018 05:39:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4JEenVR9za5HZ4eY/6eB9B9/u9N8IKGgMi9L0bn2PMQ=; b=RKfs8n4zksLP/eWmTbPicGcQes/II9HMVxCeE5Yqwb55YAQ+9e86ZLbjLo+wdtZIhu 2ZKbQsP+OjMD2m4guXK8KzIIqtUa09x8NxyRxQD2xThSmWtKqUdDi6ew8b3uNPEs2+D4 LNoM96Ahc8atz6hqyTQ2NfayoLnQRDl3/hhEIBuirU2g+Kc81l9t5SHRuOH3ngGKzCD+ PYbyhWq+td90utO+ZBTiOF/Ycb99YoL4aGgYJLgFXCVnDWC9IFMe0ksSK4fR6C0pl/ui jzHT70jMOjlAzopG+codxBaUpjgbC+RU79/HYeIBKeBmzNAY2kqU3O2VjXSOHUEfqygW AcEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4JEenVR9za5HZ4eY/6eB9B9/u9N8IKGgMi9L0bn2PMQ=; b=gf3kbqDJqXXCtpgEreTq9SyATAHCMXA/jJzp7OR+0bZ8IR13OjiEZG5/QC2AbQLTUg yS31AKm+UXrmZ+CqR1QzPrO4btaZB7difq+qV6TL0iLkw3jTvkAEoTmv7n5GOOjDtfC7 W2BSDtfRPN5Qni445hBfqRyvCVWS4t08KiF8V9PKPZvmVBg4kcnQrBcg35Bt9/fWNDX3 MlzzUuPj9zJC2j/+W0wtnmeWRMRglAQtIpW3Yf4Qm7LtujZ+xCnmMraqtES8DbXRbCWP 19AtjW5SFE8jo1mPo0ySi+X6FGTV1zirwMlx/xIdPprZU3pGZ5V4NxJFfEM+hh/8GA7e tsCw== X-Gm-Message-State: ABuFfoh/eAC6Tncti1XjVMOli4cvKUtXqDQX1HMFRwwY7ns/hsTLrKzR 96r7GuE8H1ND1mRDHM4zVhHZnGEi X-Google-Smtp-Source: ACcGV62s+hXwxU4rbNXqt8Ebs3G/ycxbP+aAwJoxPEL6XjTnrJGihj0QOrPw0w/XCpGHc/zwolf8ew== X-Received: by 2002:a2e:80d2:: with SMTP id r18-v6mr28042726ljg.100.1540039143206; Sat, 20 Oct 2018 05:39:03 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:02 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 06/59] config.txt: move apply.* to a separate file Date: Sat, 20 Oct 2018 14:37:55 +0200 Message-Id: <20181020123848.2785-7-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/apply-config.txt | 11 +++++++++++ Documentation/config.txt | 12 +----------- 2 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 Documentation/apply-config.txt diff --git a/Documentation/apply-config.txt b/Documentation/apply-config.txt new file mode 100644 index 0000000000..8fb8ef763d --- /dev/null +++ b/Documentation/apply-config.txt @@ -0,0 +1,11 @@ +apply.ignoreWhitespace:: + When set to 'change', tells 'git apply' to ignore changes in + whitespace, in the same way as the `--ignore-space-change` + option. + When set to one of: no, none, never, false tells 'git apply' to + respect all whitespace differences. + See linkgit:git-apply[1]. + +apply.whitespace:: + Tells 'git apply' how to handle whitespaces, in the same way + as the `--whitespace` option. See linkgit:git-apply[1]. diff --git a/Documentation/config.txt b/Documentation/config.txt index 29dd694438..db259129b0 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -297,17 +297,7 @@ include::alias-config.txt[] include::am-config.txt[] -apply.ignoreWhitespace:: - When set to 'change', tells 'git apply' to ignore changes in - whitespace, in the same way as the `--ignore-space-change` - option. - When set to one of: no, none, never, false tells 'git apply' to - respect all whitespace differences. - See linkgit:git-apply[1]. - -apply.whitespace:: - Tells 'git apply' how to handle whitespaces, in the same way - as the `--whitespace` option. See linkgit:git-apply[1]. +include::apply-config.txt[] blame.blankBoundary:: Show blank commit object name for boundary commits in From patchwork Sat Oct 20 12:37:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650407 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 E82D03CF1 for ; Sat, 20 Oct 2018 12:39:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D48002861E for ; Sat, 20 Oct 2018 12:39:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C918228620; Sat, 20 Oct 2018 12:39:12 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 3CD582862D for ; Sat, 20 Oct 2018 12:39:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727485AbeJTUt2 (ORCPT ); Sat, 20 Oct 2018 16:49:28 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:40825 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727373AbeJTUt0 (ORCPT ); Sat, 20 Oct 2018 16:49:26 -0400 Received: by mail-lj1-f196.google.com with SMTP id r83-v6so33086207ljr.7 for ; Sat, 20 Oct 2018 05:39:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rIauzukfnhacbmfz6JWPibbV9XMllbqB5RfI/vMeMqI=; b=lBIzvY4p9sfVjRgtWOn/nyHeZDEWaKHeFs4I2TaX697Wrpc4Ptt3gSLsl5LmrB0x2B G+I/q1d/lcoAHCrjqBvw/3Cm5IeRX5NPPkErSaoGXsG4tND0KliqpJLpuqsggD5PndIP SAIqnnhr2gnnkkJ79c5ataLgNuHgdvofIM9C7RWQOVBCFAUVMgeYkNLS1jkClRngwd9N erJZ8AJw6k0qwr3g1VP4ZJeM7RFwH0dk+W3UVcID6IiamLO48Hv8YvJeSOkPGY6oMWGs Z60LkIv0kEf5k7gw5RYjHaW25BPYYbKpVuJIV+AqNHKiSCZZE3w03/RqyJo+qlh4KAu1 AEIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rIauzukfnhacbmfz6JWPibbV9XMllbqB5RfI/vMeMqI=; b=UOrgRsK4EIwt6BI/FeA4G91uhuX/4TCxmW8tDXuToBoVt8jMfiOM6VlHzdFINAuUBS ShV7BW7LCvvjos0myzpQFA8AvBww4R3LNTmK1dBB+HlLzyO1NYOv0IVu7a+JNmfWfKG6 x6gr2T30MDg8Rdwaht9dIkebjLPQW+psZ28Rp52pjIFapqbkgvsNbeIpld6tB9rq6Qvp 9GEXZYwW06ozsWjKt1SxzffzNrfOXjKxQgJ4hLtLY4UFjazSo0RQYz0HVPLbMLnXfBDd ygD81MPdv6h0USoIeK+EKrTkN+2V5WQv1bzRjMrrUow2xhZbdDHwDFh4CFTMvSJQU2ws jadA== X-Gm-Message-State: ABuFfoiG0b2u0bSkyW9NGbJ/sQkMG90ZA68EB8hec4WDjmxbmILLC72b sygnTTtsiq5EY1ih+T0V6jVi8M5R X-Google-Smtp-Source: ACcGV60r7W+4XAtlnGY/po7Ifb0YY6EqzRi6o9qhrAobOqCoXKuY5Pw8NbxB0mgm5c++Tmbsq1iG9Q== X-Received: by 2002:a2e:8146:: with SMTP id t6-v6mr25366170ljg.32.1540039144273; Sat, 20 Oct 2018 05:39:04 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:03 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 07/59] config.txt: move blame.* to a separate file Date: Sat, 20 Oct 2018 14:37:56 +0200 Message-Id: <20181020123848.2785-8-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/blame-config.txt | 21 +++++++++++++++++++++ Documentation/config.txt | 22 +--------------------- 2 files changed, 22 insertions(+), 21 deletions(-) create mode 100644 Documentation/blame-config.txt diff --git a/Documentation/blame-config.txt b/Documentation/blame-config.txt new file mode 100644 index 0000000000..67b5c1d1e0 --- /dev/null +++ b/Documentation/blame-config.txt @@ -0,0 +1,21 @@ +blame.blankBoundary:: + Show blank commit object name for boundary commits in + linkgit:git-blame[1]. This option defaults to false. + +blame.coloring:: + This determines the coloring scheme to be applied to blame + output. It can be 'repeatedLines', 'highlightRecent', + or 'none' which is the default. + +blame.date:: + Specifies the format used to output dates in linkgit:git-blame[1]. + If unset the iso format is used. For supported values, + see the discussion of the `--date` option at linkgit:git-log[1]. + +blame.showEmail:: + Show the author email instead of author name in linkgit:git-blame[1]. + This option defaults to false. + +blame.showRoot:: + Do not treat root commits as boundaries in linkgit:git-blame[1]. + This option defaults to false. diff --git a/Documentation/config.txt b/Documentation/config.txt index db259129b0..910dcf1c25 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -299,27 +299,7 @@ include::am-config.txt[] include::apply-config.txt[] -blame.blankBoundary:: - Show blank commit object name for boundary commits in - linkgit:git-blame[1]. This option defaults to false. - -blame.coloring:: - This determines the coloring scheme to be applied to blame - output. It can be 'repeatedLines', 'highlightRecent', - or 'none' which is the default. - -blame.date:: - Specifies the format used to output dates in linkgit:git-blame[1]. - If unset the iso format is used. For supported values, - see the discussion of the `--date` option at linkgit:git-log[1]. - -blame.showEmail:: - Show the author email instead of author name in linkgit:git-blame[1]. - This option defaults to false. - -blame.showRoot:: - Do not treat root commits as boundaries in linkgit:git-blame[1]. - This option defaults to false. +include::blame-config.txt[] branch.autoSetupMerge:: Tells 'git branch' and 'git checkout' to set up new branches From patchwork Sat Oct 20 12:37:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650413 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 6589917D4 for ; Sat, 20 Oct 2018 12:39:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5017E2861E for ; Sat, 20 Oct 2018 12:39:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 404812862D; Sat, 20 Oct 2018 12:39:13 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 609C92862C for ; Sat, 20 Oct 2018 12:39:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727488AbeJTUt3 (ORCPT ); Sat, 20 Oct 2018 16:49:29 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:38696 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727289AbeJTUt2 (ORCPT ); Sat, 20 Oct 2018 16:49:28 -0400 Received: by mail-lj1-f195.google.com with SMTP id k11-v6so1112140lja.5 for ; Sat, 20 Oct 2018 05:39:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=P2zm1QOPFGoZh+KGHhYpMbDfPMoFbSl+O7+U238Qp+4=; b=Bpe6D/7w2DA23UaGmSAushaF16aWkGgT2odiG+Aa8eFEqSSK0WuntmC9JJF3pMD6tJ VD2rJFP8ILgZXnel56GayGolzBgUq7rIFO2QIptt2pkuqTOVO2Sm9eKFrXawlSvGamR4 msIPw0rZ/LdFin4gd9Z+5JCnnBMYN1/AdGaLUfHHrqUNO3Sm0IPCGWR6kHeyQ+NNGx9Q 9bxB1C9pFNSP8EG1pZKeCVe9QldvwB0xNDBQPgf8HctFl6Zv/y+epu2PsVCqh4tu+WqN yCcfYTQwken8N9CTg1qNuctsC7E10bLtTHXpSwKkABRk+gEr3Kl8fYLGfv/1Eue45Iwg H2Ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=P2zm1QOPFGoZh+KGHhYpMbDfPMoFbSl+O7+U238Qp+4=; b=cGQDkjs0NxreMmf2B1wWRMVCJjQ++BzmLYJvEyIWzz3PZPGvfB5/cV72WdodSTGkBU JHaYHgxADimYpTJ+18uH9qG8iafaXrDZeyhGBZfz3Yj/cWnPWShXDv9Wl6RlMU0CrUOs Y0asx427Wl1BqlHOUgRySpoEd4TVhNSt5wURsCrLdEOd38XhPIeu/xMT/XGbGPRmd5HU 5QtSkBQrVZ3yNF/mdylWDymDnRNiK+NyWAE1grwPv19xwiVdK/mYzqnkFh+d4HZl3hCQ 1P6fm9t/YZS+yc7g3zQufN/KgHQq2PwB0rhheYoh1QWbJWzRuHicsReDxqrtX1tMBhOj KjPA== X-Gm-Message-State: ABuFfog8a99gGpm67nTMiLrxb2pv2dt1sncMpUk7us+NmsJRWmXO55dX +2L6Ol4/tf5CMjAyq34jrWc6vzoC X-Google-Smtp-Source: ACcGV62lngGLid3eE9JEpm8Sgwz2OICj21pUhS+LAZcJdih1cDvkKQpuifl/Hjoo7TKmW4XtVsu0fw== X-Received: by 2002:a2e:52ca:: with SMTP id n71-v6mr24361876lje.54.1540039145447; Sat, 20 Oct 2018 05:39:05 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:04 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 08/59] config.txt: move branch.* to a separate file Date: Sat, 20 Oct 2018 14:37:57 +0200 Message-Id: <20181020123848.2785-9-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/branch-config.txt | 102 +++++++++++++++++++++++++++++++ Documentation/config.txt | 103 +------------------------------- 2 files changed, 103 insertions(+), 102 deletions(-) create mode 100644 Documentation/branch-config.txt diff --git a/Documentation/branch-config.txt b/Documentation/branch-config.txt new file mode 100644 index 0000000000..019d60ede2 --- /dev/null +++ b/Documentation/branch-config.txt @@ -0,0 +1,102 @@ +branch.autoSetupMerge:: + Tells 'git branch' and 'git checkout' to set up new branches + so that linkgit:git-pull[1] will appropriately merge from the + starting point branch. Note that even if this option is not set, + this behavior can be chosen per-branch using the `--track` + and `--no-track` options. The valid settings are: `false` -- no + automatic setup is done; `true` -- automatic setup is done when the + starting point is a remote-tracking branch; `always` -- + automatic setup is done when the starting point is either a + local branch or remote-tracking + branch. This option defaults to true. + +branch.autoSetupRebase:: + When a new branch is created with 'git branch' or 'git checkout' + that tracks another branch, this variable tells Git to set + up pull to rebase instead of merge (see "branch..rebase"). + When `never`, rebase is never automatically set to true. + When `local`, rebase is set to true for tracked branches of + other local branches. + When `remote`, rebase is set to true for tracked branches of + remote-tracking branches. + When `always`, rebase will be set to true for all tracking + branches. + See "branch.autoSetupMerge" for details on how to set up a + branch to track another branch. + This option defaults to never. + +branch.sort:: + This variable controls the sort ordering of branches when displayed by + linkgit:git-branch[1]. Without the "--sort=" option provided, the + value of this variable will be used as the default. + See linkgit:git-for-each-ref[1] field names for valid values. + +branch..remote:: + When on branch , it tells 'git fetch' and 'git push' + which remote to fetch from/push to. The remote to push to + may be overridden with `remote.pushDefault` (for all branches). + The remote to push to, for the current branch, may be further + overridden by `branch..pushRemote`. If no remote is + configured, or if you are not on any branch, it defaults to + `origin` for fetching and `remote.pushDefault` for pushing. + Additionally, `.` (a period) is the current local repository + (a dot-repository), see `branch..merge`'s final note below. + +branch..pushRemote:: + When on branch , it overrides `branch..remote` for + pushing. It also overrides `remote.pushDefault` for pushing + from branch . When you pull from one place (e.g. your + upstream) and push to another place (e.g. your own publishing + repository), you would want to set `remote.pushDefault` to + specify the remote to push to for all branches, and use this + option to override it for a specific branch. + +branch..merge:: + Defines, together with branch..remote, the upstream branch + for the given branch. It tells 'git fetch'/'git pull'/'git rebase' which + branch to merge and can also affect 'git push' (see push.default). + When in branch , it tells 'git fetch' the default + refspec to be marked for merging in FETCH_HEAD. The value is + handled like the remote part of a refspec, and must match a + ref which is fetched from the remote given by + "branch..remote". + The merge information is used by 'git pull' (which at first calls + 'git fetch') to lookup the default branch for merging. Without + this option, 'git pull' defaults to merge the first refspec fetched. + Specify multiple values to get an octopus merge. + If you wish to setup 'git pull' so that it merges into from + another branch in the local repository, you can point + branch..merge to the desired branch, and use the relative path + setting `.` (a period) for branch..remote. + +branch..mergeOptions:: + Sets default options for merging into branch . The syntax and + supported options are the same as those of linkgit:git-merge[1], but + option values containing whitespace characters are currently not + supported. + +branch..rebase:: + When true, rebase the branch on top of the fetched branch, + instead of merging the default branch from the default remote when + "git pull" is run. See "pull.rebase" for doing this in a non + branch-specific manner. ++ +When `merges`, pass the `--rebase-merges` option to 'git rebase' +so that the local merge commits are included in the rebase (see +linkgit:git-rebase[1] for details). ++ +When preserve, also pass `--preserve-merges` along to 'git rebase' +so that locally committed merge commits will not be flattened +by running 'git pull'. ++ +When the value is `interactive`, the rebase is run in interactive mode. ++ +*NOTE*: this is a possibly dangerous operation; do *not* use +it unless you understand the implications (see linkgit:git-rebase[1] +for details). + +branch..description:: + Branch description, can be edited with + `git branch --edit-description`. Branch description is + automatically added in the format-patch cover letter or + request-pull summary. diff --git a/Documentation/config.txt b/Documentation/config.txt index 910dcf1c25..249b90b107 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -301,108 +301,7 @@ include::apply-config.txt[] include::blame-config.txt[] -branch.autoSetupMerge:: - Tells 'git branch' and 'git checkout' to set up new branches - so that linkgit:git-pull[1] will appropriately merge from the - starting point branch. Note that even if this option is not set, - this behavior can be chosen per-branch using the `--track` - and `--no-track` options. The valid settings are: `false` -- no - automatic setup is done; `true` -- automatic setup is done when the - starting point is a remote-tracking branch; `always` -- - automatic setup is done when the starting point is either a - local branch or remote-tracking - branch. This option defaults to true. - -branch.autoSetupRebase:: - When a new branch is created with 'git branch' or 'git checkout' - that tracks another branch, this variable tells Git to set - up pull to rebase instead of merge (see "branch..rebase"). - When `never`, rebase is never automatically set to true. - When `local`, rebase is set to true for tracked branches of - other local branches. - When `remote`, rebase is set to true for tracked branches of - remote-tracking branches. - When `always`, rebase will be set to true for all tracking - branches. - See "branch.autoSetupMerge" for details on how to set up a - branch to track another branch. - This option defaults to never. - -branch.sort:: - This variable controls the sort ordering of branches when displayed by - linkgit:git-branch[1]. Without the "--sort=" option provided, the - value of this variable will be used as the default. - See linkgit:git-for-each-ref[1] field names for valid values. - -branch..remote:: - When on branch , it tells 'git fetch' and 'git push' - which remote to fetch from/push to. The remote to push to - may be overridden with `remote.pushDefault` (for all branches). - The remote to push to, for the current branch, may be further - overridden by `branch..pushRemote`. If no remote is - configured, or if you are not on any branch, it defaults to - `origin` for fetching and `remote.pushDefault` for pushing. - Additionally, `.` (a period) is the current local repository - (a dot-repository), see `branch..merge`'s final note below. - -branch..pushRemote:: - When on branch , it overrides `branch..remote` for - pushing. It also overrides `remote.pushDefault` for pushing - from branch . When you pull from one place (e.g. your - upstream) and push to another place (e.g. your own publishing - repository), you would want to set `remote.pushDefault` to - specify the remote to push to for all branches, and use this - option to override it for a specific branch. - -branch..merge:: - Defines, together with branch..remote, the upstream branch - for the given branch. It tells 'git fetch'/'git pull'/'git rebase' which - branch to merge and can also affect 'git push' (see push.default). - When in branch , it tells 'git fetch' the default - refspec to be marked for merging in FETCH_HEAD. The value is - handled like the remote part of a refspec, and must match a - ref which is fetched from the remote given by - "branch..remote". - The merge information is used by 'git pull' (which at first calls - 'git fetch') to lookup the default branch for merging. Without - this option, 'git pull' defaults to merge the first refspec fetched. - Specify multiple values to get an octopus merge. - If you wish to setup 'git pull' so that it merges into from - another branch in the local repository, you can point - branch..merge to the desired branch, and use the relative path - setting `.` (a period) for branch..remote. - -branch..mergeOptions:: - Sets default options for merging into branch . The syntax and - supported options are the same as those of linkgit:git-merge[1], but - option values containing whitespace characters are currently not - supported. - -branch..rebase:: - When true, rebase the branch on top of the fetched branch, - instead of merging the default branch from the default remote when - "git pull" is run. See "pull.rebase" for doing this in a non - branch-specific manner. -+ -When `merges`, pass the `--rebase-merges` option to 'git rebase' -so that the local merge commits are included in the rebase (see -linkgit:git-rebase[1] for details). -+ -When preserve, also pass `--preserve-merges` along to 'git rebase' -so that locally committed merge commits will not be flattened -by running 'git pull'. -+ -When the value is `interactive`, the rebase is run in interactive mode. -+ -*NOTE*: this is a possibly dangerous operation; do *not* use -it unless you understand the implications (see linkgit:git-rebase[1] -for details). - -branch..description:: - Branch description, can be edited with - `git branch --edit-description`. Branch description is - automatically added in the format-patch cover letter or - request-pull summary. +include::branch-config.txt[] browser..cmd:: Specify the command to invoke the specified browser. The From patchwork Sat Oct 20 12:37:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650419 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 229C7112B for ; Sat, 20 Oct 2018 12:39:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0E1972861D for ; Sat, 20 Oct 2018 12:39:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 02C4C28620; Sat, 20 Oct 2018 12:39:14 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 A5EF22861D for ; Sat, 20 Oct 2018 12:39:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727500AbeJTUta (ORCPT ); Sat, 20 Oct 2018 16:49:30 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:36400 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727470AbeJTUt3 (ORCPT ); Sat, 20 Oct 2018 16:49:29 -0400 Received: by mail-lj1-f193.google.com with SMTP id p89-v6so33110325ljb.3 for ; Sat, 20 Oct 2018 05:39:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mP/yaHYsFFp7fXWD5JAEe0+f+SbKESmti5h1K3R0gDU=; b=l8zhOG9AfSY3cGGgO2Igj2nfwfOFDfz6AfkiU18sve/d/XxmVzvkCeJf6O/eAoSya1 kiOMAgQb5O3T6c5qaz4tOuRv3RNtcxHshWrIusTza+KDtsRE8I1amLNPbrIOpkcydMKK AtXBH1l27Xf79BjuJOemaR2UouEklJY2l9rpJFCcS3FhjuGLUNm8hkbrtdbLH5eF16sN ha/4XSbHYrCdFArqydHy9RPZP3TaJ7atkfSKFLeJbDzxKrbwloieXtb2H9Kf2ZHIAot8 Dsdk8yQeBHio26td39su5yXekYpWnDMmXEHc4kt/6g6YiWFKfX4JaPajF3FnMiQv45lz MvUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mP/yaHYsFFp7fXWD5JAEe0+f+SbKESmti5h1K3R0gDU=; b=ENninZXrLn897kWxCJZte1stB65YAy5+f9j+UWK+st9vZ5xqhhg2s1OBw/4hPlsDB8 ebaRNWu466OHXZJvLmqPJOLRL7Qk7aXj2dg/cb5DpcXd/CUA3RWdSKTS7flsB5nnnf3o 30B7CaItFl5QYFwbDSMLryhp5cPkv0F4LmblDsfZtj+qlGb8QPUuCsiyaXV9aKV7JSDV grl91ncg9QF3pio0DAFA9FQPYmU7BG+mjspNFJGy9jod43PcZPaip5tEzspoSG/X80Zz mt4JrzRTWCGYZZN0f3y/6SMvKKUdh+WoSpSeCEp2t7nhQNRk0W3IpgCgQf1icnEbdFqi egig== X-Gm-Message-State: ABuFfoikr35puSYNR22MHwZwb5b/9PDCiB2+6p5CqbdWU1E5LwPGOEb8 NwxZCQPxwVZotQtG3Hm9UCdBtXIc X-Google-Smtp-Source: ACcGV61nAii2OGAKWl5pUpTJ6Pjr8X+BJKtBYbe6vSkGiKky6h5+/itosxWILv2fhAQgbuz5qnutKg== X-Received: by 2002:a2e:1615:: with SMTP id w21-v6mr25536776ljd.33.1540039146604; Sat, 20 Oct 2018 05:39:06 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:05 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 09/59] config.txt: move browser.* to a separate file Date: Sat, 20 Oct 2018 14:37:58 +0200 Message-Id: <20181020123848.2785-10-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/browser-config.txt | 9 +++++++++ Documentation/config.txt | 10 +--------- 2 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 Documentation/browser-config.txt diff --git a/Documentation/browser-config.txt b/Documentation/browser-config.txt new file mode 100644 index 0000000000..195df207a6 --- /dev/null +++ b/Documentation/browser-config.txt @@ -0,0 +1,9 @@ +browser..cmd:: + Specify the command to invoke the specified browser. The + specified command is evaluated in shell with the URLs passed + as arguments. (See linkgit:git-web{litdd}browse[1].) + +browser..path:: + Override the path for the given tool that may be used to + browse HTML help (see `-w` option in linkgit:git-help[1]) or a + working repository in gitweb (see linkgit:git-instaweb[1]). diff --git a/Documentation/config.txt b/Documentation/config.txt index 249b90b107..407fd390a2 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -303,15 +303,7 @@ include::blame-config.txt[] include::branch-config.txt[] -browser..cmd:: - Specify the command to invoke the specified browser. The - specified command is evaluated in shell with the URLs passed - as arguments. (See linkgit:git-web{litdd}browse[1].) - -browser..path:: - Override the path for the given tool that may be used to - browse HTML help (see `-w` option in linkgit:git-help[1]) or a - working repository in gitweb (see linkgit:git-instaweb[1]). +include::browser-config.txt[] checkout.defaultRemote:: When you run 'git checkout ' and only have one From patchwork Sat Oct 20 12:37:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650411 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 2BF7B46E4 for ; Sat, 20 Oct 2018 12:39:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1561A2861E for ; Sat, 20 Oct 2018 12:39:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0A3EE28620; Sat, 20 Oct 2018 12:39:13 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 9B96028627 for ; Sat, 20 Oct 2018 12:39:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727506AbeJTUta (ORCPT ); Sat, 20 Oct 2018 16:49:30 -0400 Received: from mail-lj1-f194.google.com ([209.85.208.194]:40829 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727473AbeJTUt3 (ORCPT ); Sat, 20 Oct 2018 16:49:29 -0400 Received: by mail-lj1-f194.google.com with SMTP id r83-v6so33086306ljr.7 for ; Sat, 20 Oct 2018 05:39:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Yj9tn2TJvTbWrW1DkEERIb5NcUIEsBRyeA3IGauGRMk=; b=tM8R7nURT7cjAlWl34x3hAFfKc1HWKyIRtPsFFQMlpxNRkvThCVRa7R1KYYCXrqGrd F0Ebp7ImUgVyYViBDYm+hVEFPhGKWRo/zPOvC8whDPuWQ1FYo4ui+4462A4GXsWFlxb+ oOi0LhAKlhlXrE2YCpCIrk/W44I+caw4s6lD84bGZEYtBe7kP/XJhBzvfYAqoLcNPyCq rDTEbeJ+WWhJhzspcvl/x2FVoxQQ7eDG8rusjF6bUUmHgwWiT1VN+zU3mfePC0/BR5um be5SShPvYx2VblDfSx8OhLlxR02V/FpVWXGAT10DnV5cCtb8sdlAnkcTer7qXILu9Pol plrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Yj9tn2TJvTbWrW1DkEERIb5NcUIEsBRyeA3IGauGRMk=; b=onkeh54EfD6y/AxGV6idMED4x5icE+7Twyu6q3C+v9FXaJP03a0564U7frdL7MVtqN HJ42tzE/4TeuLNk9FbPGXqzNSjt06+nRqTzy8RK8byxydlZUtabp54Em8Mjk7ZrnK5+B csTQEJ8vaRKSCjvCJhT0xm7lO3GqNTc36lRPBvqus1HUY14c4G6Kjf9gSi/zo60RBU63 VDRJKXPNRiaobkOjVaOHMqB9FSSmoJ6wWdmOEIsNhNqRQu2DPhy9s0puHRzTVW/PTL3N u6GVYyUikQIvfnp0iOOEez3nqsQ6w5Kr2aF2ovsDKzD8Y/gRU0ikNBncrokJLxE/lTVY pRPw== X-Gm-Message-State: ABuFfohThqf2qdQeCVCZ9DNwcx6Tc/ZrHWhryTM59i9N1V+EvcVSDHjh vmR1x6i9MwUkbFIc9VhCVnLSjSV0 X-Google-Smtp-Source: ACcGV60Y9LW6xcRdx0ptDX0ZTVI1SrHhiyP4ChwBy/eHXjaosn4fpwTgs1o5CiCteB1tPiuBDNgqCg== X-Received: by 2002:a2e:7f14:: with SMTP id a20-v6mr24754553ljd.148.1540039147645; Sat, 20 Oct 2018 05:39:07 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:06 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 10/59] config.txt: move checkout.* to a separate file Date: Sat, 20 Oct 2018 14:37:59 +0200 Message-Id: <20181020123848.2785-11-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/checkout-config.txt | 23 +++++++++++++++++++++++ Documentation/config.txt | 24 +----------------------- 2 files changed, 24 insertions(+), 23 deletions(-) create mode 100644 Documentation/checkout-config.txt diff --git a/Documentation/checkout-config.txt b/Documentation/checkout-config.txt new file mode 100644 index 0000000000..c4118fa196 --- /dev/null +++ b/Documentation/checkout-config.txt @@ -0,0 +1,23 @@ +checkout.defaultRemote:: + When you run 'git checkout ' and only have one + remote, it may implicitly fall back on checking out and + tracking e.g. 'origin/'. This stops working as soon + as you have more than one remote with a '' + reference. This setting allows for setting the name of a + preferred remote that should always win when it comes to + disambiguation. The typical use-case is to set this to + `origin`. ++ +Currently this is used by linkgit:git-checkout[1] when 'git checkout +' will checkout the '' branch on another remote, +and by linkgit:git-worktree[1] when 'git worktree add' refers to a +remote branch. This setting might be used for other checkout-like +commands or functionality in the future. + +checkout.optimizeNewBranch:: + Optimizes the performance of "git checkout -b " when + using sparse-checkout. When set to true, git will not update the + repo based on the current sparse-checkout settings. This means it + will not update the skip-worktree bit in the index nor add/remove + files in the working directory to reflect the current sparse checkout + settings nor will it show the local changes. diff --git a/Documentation/config.txt b/Documentation/config.txt index 407fd390a2..8d890cc22a 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -305,29 +305,7 @@ include::branch-config.txt[] include::browser-config.txt[] -checkout.defaultRemote:: - When you run 'git checkout ' and only have one - remote, it may implicitly fall back on checking out and - tracking e.g. 'origin/'. This stops working as soon - as you have more than one remote with a '' - reference. This setting allows for setting the name of a - preferred remote that should always win when it comes to - disambiguation. The typical use-case is to set this to - `origin`. -+ -Currently this is used by linkgit:git-checkout[1] when 'git checkout -' will checkout the '' branch on another remote, -and by linkgit:git-worktree[1] when 'git worktree add' refers to a -remote branch. This setting might be used for other checkout-like -commands or functionality in the future. - -checkout.optimizeNewBranch:: - Optimizes the performance of "git checkout -b " when - using sparse-checkout. When set to true, git will not update the - repo based on the current sparse-checkout settings. This means it - will not update the skip-worktree bit in the index nor add/remove - files in the working directory to reflect the current sparse checkout - settings nor will it show the local changes. +include::checkout-config.txt[] clean.requireForce:: A boolean to make git-clean do nothing unless given -f, From patchwork Sat Oct 20 12:38:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650417 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 0439390 for ; Sat, 20 Oct 2018 12:39:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E3C662861D for ; Sat, 20 Oct 2018 12:39:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D86C828620; Sat, 20 Oct 2018 12:39:13 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 849B22861D for ; Sat, 20 Oct 2018 12:39:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727510AbeJTUtb (ORCPT ); Sat, 20 Oct 2018 16:49:31 -0400 Received: from mail-lj1-f194.google.com ([209.85.208.194]:44789 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727289AbeJTUta (ORCPT ); Sat, 20 Oct 2018 16:49:30 -0400 Received: by mail-lj1-f194.google.com with SMTP id v6-v6so33058096ljc.11 for ; Sat, 20 Oct 2018 05:39:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+baa0Ewd/jcRusWUqRenhSS7VTMS3KXFxGtDn8/8ttw=; b=jJmaiM0sutPY6Bl2swbwbrfGOdru0FUzAQjCZQzFrv4P5bNHNCHrz2LGZpK1x1agTh wZlCeKofQzaK9PfDCIlwP1hZ8dSGkR5uKVpyjpFO5JX5BDA+C4+jBrZ0y231IPnk53EC jr8s8VFM5xG7qqFrwM8R2alkKixUwI2TfZG7BQlZLwxS7L60eTDgrRKJEMMsQXq83nzw ccDyYXlPQybyZ9Oi/YBUBrgN4jAoC/QEq1wCHDWSvbeG2ZJ3wUbj4J0xd75SfsarYiK2 7tiMursjdnki8aa7hxakaoJRrfOJ4Ck0QcHisC9gXC7dMnrQHlfEHRLrwomOA2KdefXq So4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+baa0Ewd/jcRusWUqRenhSS7VTMS3KXFxGtDn8/8ttw=; b=OYI17Pxp9rToDvwoXW+KkyARKYa+QN9EuNXWjFqQAl5qWanoXDrwpTZb1/xjicaY/h EnfgTuM3S3GwdVGzaTxia0RUuwu7+U3xNKSIHdxJHskBOknXvNMzO8+7aG4RlLB2d00v gYcaBN59M3lx+1GFj9V9UeNjaOuQ8r6KV4RuckhNkK3lNOQqoPZMHRGFafsLGlMN6yBO LSEg7tPEAPC5jzY6IM/jbXgLoB2q/E4IUMfJCwBfZY4pnxigfyciqo0liOd65DV0pcDw tFJZVa4JCE2T2nahBvzD8l+uPF22tnTY89qMBLy/30Lx3tqDWSwGBe8laIz8PlWuZqvi SQpQ== X-Gm-Message-State: ABuFfoir1HM5fqL3aJHJslkzFnbN+1nYyELUdq2VvQi3DmCA940i2gSH 1BLkhdgRrpDo7OYR2avy8FhDd2G7 X-Google-Smtp-Source: ACcGV62yYMADbUDVULLxVY8jtcQakGCMFhffRAxqBYu3CjfaoLYZyZBTNxJVLEyJjBXz6fITfkOaPQ== X-Received: by 2002:a2e:7109:: with SMTP id m9-v6mr24997460ljc.176.1540039148682; Sat, 20 Oct 2018 05:39:08 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:07 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 11/59] config.txt: move clean.* to a separate file Date: Sat, 20 Oct 2018 14:38:00 +0200 Message-Id: <20181020123848.2785-12-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/clean-config.txt | 3 +++ Documentation/config.txt | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 Documentation/clean-config.txt diff --git a/Documentation/clean-config.txt b/Documentation/clean-config.txt new file mode 100644 index 0000000000..a807c925b9 --- /dev/null +++ b/Documentation/clean-config.txt @@ -0,0 +1,3 @@ +clean.requireForce:: + A boolean to make git-clean do nothing unless given -f, + -i or -n. Defaults to true. diff --git a/Documentation/config.txt b/Documentation/config.txt index 8d890cc22a..77acf785d1 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -307,9 +307,7 @@ include::browser-config.txt[] include::checkout-config.txt[] -clean.requireForce:: - A boolean to make git-clean do nothing unless given -f, - -i or -n. Defaults to true. +include::clean-config.txt[] color.advice:: A boolean to enable/disable color in hints (e.g. when a push From patchwork Sat Oct 20 12:38:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650427 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 827E5112B for ; Sat, 20 Oct 2018 12:39:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B2202861D for ; Sat, 20 Oct 2018 12:39:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5F87728620; Sat, 20 Oct 2018 12:39:18 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 275B72861D for ; Sat, 20 Oct 2018 12:39:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727528AbeJTUtf (ORCPT ); Sat, 20 Oct 2018 16:49:35 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:39192 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727473AbeJTUtd (ORCPT ); Sat, 20 Oct 2018 16:49:33 -0400 Received: by mail-lj1-f195.google.com with SMTP id p1-v6so33093633ljg.6 for ; Sat, 20 Oct 2018 05:39:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=35vEo+Dxmer/e9cj8c4tPVMYxgio15AxEdR0Zz9BTJ8=; b=YQ2T0a+KJUIATX+Ji4eONdPfuHFZ3FQ5s7kL3kWAuuszq/gjYCPgYx27/USkmiLBch uFlOeVOr6qgWWFyg92hSeM3acc7H97Kh4chDhurlKpIUa3NZ6cRq85DPk83aVPTEKLBL uar7q0KH0AaKsjMl0kARn1ieWEEhuLzRnCJHLVwDQFhQhBBq8C0KzYB14OXTGr4ZTMRK pRZNnh77qu/eThtKNo+CjQSmUvpYbChLVd+I+zQWZC59/4D8/+xwY7PZ9uavxfyUupKE fh4ZqQabKDqRxMB8T69Ue69yLcOrEcQayQrUiC8zQdNT2uHxISg7E9DveT4n71E5Rtkd SIIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=35vEo+Dxmer/e9cj8c4tPVMYxgio15AxEdR0Zz9BTJ8=; b=I7qbdau2L7ewyshJc9HDpCG3JCsF1bkVD1r3VGTDOE1bbi01o5bvKr4tWQYCaGOE64 BXKeA1p0TU4VEgpya+RbUkof2PPlhJw+7dJ1Lpp8mz7HV4fJN9m17fNL1t7J1Yocae3d mx7rHDejfW0JePPiyNE/+14Ov4zODhI06nHuhISmzz8F2gutNZaIcWDw4gkbdmq1etAZ LTbvMQQVzMPorg5Lnjkj81davg3YIKEcVqJeI42XqgrJnyKGQuAC2LEVSUwYmZIJFg24 fVytIF42w6F/AvPcNy1mSPP4nQR1Xo0SNk1VHoOZzM50foj2EEBj0UqWOFwH7qnikIIl 1UPw== X-Gm-Message-State: ABuFfojtQZg7My7ZrTKC5hIEinlY84Lc8Ps785BSCn1ctZB5ovlgSeIq DQUfyn+iNNFtFNo8UL8TIzOyusfe X-Google-Smtp-Source: ACcGV63LIvUY3s7OGy/V3r6FfajqFK6HuaxtGO2qMeAshI6dapgxnTzcsjZgjIJMS/W7USZJkijb0A== X-Received: by 2002:a2e:3e0b:: with SMTP id l11-v6mr27509279lja.16.1540039149825; Sat, 20 Oct 2018 05:39:09 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:09 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 12/59] config.txt: move color.* to a separate file Date: Sat, 20 Oct 2018 14:38:01 +0200 Message-Id: <20181020123848.2785-13-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/color-config.txt | 201 ++++++++++++++++++++++++++++++++ Documentation/config.txt | 202 +-------------------------------- 2 files changed, 202 insertions(+), 201 deletions(-) create mode 100644 Documentation/color-config.txt diff --git a/Documentation/color-config.txt b/Documentation/color-config.txt new file mode 100644 index 0000000000..8375596c44 --- /dev/null +++ b/Documentation/color-config.txt @@ -0,0 +1,201 @@ +color.advice:: + A boolean to enable/disable color in hints (e.g. when a push + failed, see `advice.*` for a list). May be set to `always`, + `false` (or `never`) or `auto` (or `true`), in which case colors + are used only when the error output goes to a terminal. If + unset, then the value of `color.ui` is used (`auto` by default). + +color.advice.hint:: + Use customized color for hints. + +color.blame.highlightRecent:: + This can be used to color the metadata of a blame line depending + on age of the line. ++ +This setting should be set to a comma-separated list of color and date settings, +starting and ending with a color, the dates should be set from oldest to newest. +The metadata will be colored given the colors if the the line was introduced +before the given timestamp, overwriting older timestamped colors. ++ +Instead of an absolute timestamp relative timestamps work as well, e.g. +2.weeks.ago is valid to address anything older than 2 weeks. ++ +It defaults to 'blue,12 month ago,white,1 month ago,red', which colors +everything older than one year blue, recent changes between one month and +one year old are kept white, and lines introduced within the last month are +colored red. + +color.blame.repeatedLines:: + Use the customized color for the part of git-blame output that + is repeated meta information per line (such as commit id, + author name, date and timezone). Defaults to cyan. + +color.branch:: + A boolean to enable/disable color in the output of + linkgit:git-branch[1]. May be set to `always`, + `false` (or `never`) or `auto` (or `true`), in which case colors are used + only when the output is to a terminal. If unset, then the + value of `color.ui` is used (`auto` by default). + +color.branch.:: + Use customized color for branch coloration. `` is one of + `current` (the current branch), `local` (a local branch), + `remote` (a remote-tracking branch in refs/remotes/), + `upstream` (upstream tracking branch), `plain` (other + refs). + +color.diff:: + Whether to use ANSI escape sequences to add color to patches. + If this is set to `always`, linkgit:git-diff[1], + linkgit:git-log[1], and linkgit:git-show[1] will use color + for all patches. If it is set to `true` or `auto`, those + commands will only use color when output is to the terminal. + If unset, then the value of `color.ui` is used (`auto` by + default). ++ +This does not affect linkgit:git-format-patch[1] or the +'git-diff-{asterisk}' plumbing commands. Can be overridden on the +command line with the `--color[=]` option. + +color.diff.:: + Use customized color for diff colorization. `` specifies + which part of the patch to use the specified color, and is one + of `context` (context text - `plain` is a historical synonym), + `meta` (metainformation), `frag` + (hunk header), 'func' (function in hunk header), `old` (removed lines), + `new` (added lines), `commit` (commit headers), `whitespace` + (highlighting whitespace errors), `oldMoved` (deleted lines), + `newMoved` (added lines), `oldMovedDimmed`, `oldMovedAlternative`, + `oldMovedAlternativeDimmed`, `newMovedDimmed`, `newMovedAlternative` + `newMovedAlternativeDimmed` (See the '' + setting of '--color-moved' in linkgit:git-diff[1] for details), + `contextDimmed`, `oldDimmed`, `newDimmed`, `contextBold`, + `oldBold`, and `newBold` (see linkgit:git-range-diff[1] for details). + +color.decorate.:: + Use customized color for 'git log --decorate' output. `` is one + of `branch`, `remoteBranch`, `tag`, `stash` or `HEAD` for local + branches, remote-tracking branches, tags, stash and HEAD, respectively + and `grafted` for grafted commits. + +color.grep:: + When set to `always`, always highlight matches. When `false` (or + `never`), never. When set to `true` or `auto`, use color only + when the output is written to the terminal. If unset, then the + value of `color.ui` is used (`auto` by default). + +color.grep.:: + Use customized color for grep colorization. `` specifies which + part of the line to use the specified color, and is one of ++ +-- +`context`;; + non-matching text in context lines (when using `-A`, `-B`, or `-C`) +`filename`;; + filename prefix (when not using `-h`) +`function`;; + function name lines (when using `-p`) +`lineNumber`;; + line number prefix (when using `-n`) +`column`;; + column number prefix (when using `--column`) +`match`;; + matching text (same as setting `matchContext` and `matchSelected`) +`matchContext`;; + matching text in context lines +`matchSelected`;; + matching text in selected lines +`selected`;; + non-matching text in selected lines +`separator`;; + separators between fields on a line (`:`, `-`, and `=`) + and between hunks (`--`) +-- + +color.interactive:: + When set to `always`, always use colors for interactive prompts + and displays (such as those used by "git-add --interactive" and + "git-clean --interactive"). When false (or `never`), never. + When set to `true` or `auto`, use colors only when the output is + to the terminal. If unset, then the value of `color.ui` is + used (`auto` by default). + +color.interactive.:: + Use customized color for 'git add --interactive' and 'git clean + --interactive' output. `` may be `prompt`, `header`, `help` + or `error`, for four distinct types of normal output from + interactive commands. + +color.pager:: + A boolean to enable/disable colored output when the pager is in + use (default is true). + +color.push:: + A boolean to enable/disable color in push errors. May be set to + `always`, `false` (or `never`) or `auto` (or `true`), in which + case colors are used only when the error output goes to a terminal. + If unset, then the value of `color.ui` is used (`auto` by default). + +color.push.error:: + Use customized color for push errors. + +color.remote:: + If set, keywords at the start of the line are highlighted. The + keywords are "error", "warning", "hint" and "success", and are + matched case-insensitively. May be set to `always`, `false` (or + `never`) or `auto` (or `true`). If unset, then the value of + `color.ui` is used (`auto` by default). + +color.remote.:: + Use customized color for each remote keyword. `` may be + `hint`, `warning`, `success` or `error` which match the + corresponding keyword. + +color.showBranch:: + A boolean to enable/disable color in the output of + linkgit:git-show-branch[1]. May be set to `always`, + `false` (or `never`) or `auto` (or `true`), in which case colors are used + only when the output is to a terminal. If unset, then the + value of `color.ui` is used (`auto` by default). + +color.status:: + A boolean to enable/disable color in the output of + linkgit:git-status[1]. May be set to `always`, + `false` (or `never`) or `auto` (or `true`), in which case colors are used + only when the output is to a terminal. If unset, then the + value of `color.ui` is used (`auto` by default). + +color.status.:: + Use customized color for status colorization. `` is + one of `header` (the header text of the status message), + `added` or `updated` (files which are added but not committed), + `changed` (files which are changed but not added in the index), + `untracked` (files which are not tracked by Git), + `branch` (the current branch), + `nobranch` (the color the 'no branch' warning is shown in, defaulting + to red), + `localBranch` or `remoteBranch` (the local and remote branch names, + respectively, when branch and tracking information is displayed in the + status short-format), or + `unmerged` (files which have unmerged changes). + +color.transport:: + A boolean to enable/disable color when pushes are rejected. May be + set to `always`, `false` (or `never`) or `auto` (or `true`), in which + case colors are used only when the error output goes to a terminal. + If unset, then the value of `color.ui` is used (`auto` by default). + +color.transport.rejected:: + Use customized color when a push was rejected. + +color.ui:: + This variable determines the default value for variables such + as `color.diff` and `color.grep` that control the use of color + per command family. Its scope will expand as more commands learn + configuration to set a default for the `--color` option. Set it + to `false` or `never` if you prefer Git commands not to use + color unless enabled explicitly with some other configuration + or the `--color` option. Set it to `always` if you want all + output not intended for machine consumption to use color, to + `true` or `auto` (this is the default since Git 1.8.4) if you + want such output to use color when written to the terminal. diff --git a/Documentation/config.txt b/Documentation/config.txt index 77acf785d1..9e2c6c292b 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -309,207 +309,7 @@ include::checkout-config.txt[] include::clean-config.txt[] -color.advice:: - A boolean to enable/disable color in hints (e.g. when a push - failed, see `advice.*` for a list). May be set to `always`, - `false` (or `never`) or `auto` (or `true`), in which case colors - are used only when the error output goes to a terminal. If - unset, then the value of `color.ui` is used (`auto` by default). - -color.advice.hint:: - Use customized color for hints. - -color.blame.highlightRecent:: - This can be used to color the metadata of a blame line depending - on age of the line. -+ -This setting should be set to a comma-separated list of color and date settings, -starting and ending with a color, the dates should be set from oldest to newest. -The metadata will be colored given the colors if the the line was introduced -before the given timestamp, overwriting older timestamped colors. -+ -Instead of an absolute timestamp relative timestamps work as well, e.g. -2.weeks.ago is valid to address anything older than 2 weeks. -+ -It defaults to 'blue,12 month ago,white,1 month ago,red', which colors -everything older than one year blue, recent changes between one month and -one year old are kept white, and lines introduced within the last month are -colored red. - -color.blame.repeatedLines:: - Use the customized color for the part of git-blame output that - is repeated meta information per line (such as commit id, - author name, date and timezone). Defaults to cyan. - -color.branch:: - A boolean to enable/disable color in the output of - linkgit:git-branch[1]. May be set to `always`, - `false` (or `never`) or `auto` (or `true`), in which case colors are used - only when the output is to a terminal. If unset, then the - value of `color.ui` is used (`auto` by default). - -color.branch.:: - Use customized color for branch coloration. `` is one of - `current` (the current branch), `local` (a local branch), - `remote` (a remote-tracking branch in refs/remotes/), - `upstream` (upstream tracking branch), `plain` (other - refs). - -color.diff:: - Whether to use ANSI escape sequences to add color to patches. - If this is set to `always`, linkgit:git-diff[1], - linkgit:git-log[1], and linkgit:git-show[1] will use color - for all patches. If it is set to `true` or `auto`, those - commands will only use color when output is to the terminal. - If unset, then the value of `color.ui` is used (`auto` by - default). -+ -This does not affect linkgit:git-format-patch[1] or the -'git-diff-{asterisk}' plumbing commands. Can be overridden on the -command line with the `--color[=]` option. - -color.diff.:: - Use customized color for diff colorization. `` specifies - which part of the patch to use the specified color, and is one - of `context` (context text - `plain` is a historical synonym), - `meta` (metainformation), `frag` - (hunk header), 'func' (function in hunk header), `old` (removed lines), - `new` (added lines), `commit` (commit headers), `whitespace` - (highlighting whitespace errors), `oldMoved` (deleted lines), - `newMoved` (added lines), `oldMovedDimmed`, `oldMovedAlternative`, - `oldMovedAlternativeDimmed`, `newMovedDimmed`, `newMovedAlternative` - `newMovedAlternativeDimmed` (See the '' - setting of '--color-moved' in linkgit:git-diff[1] for details), - `contextDimmed`, `oldDimmed`, `newDimmed`, `contextBold`, - `oldBold`, and `newBold` (see linkgit:git-range-diff[1] for details). - -color.decorate.:: - Use customized color for 'git log --decorate' output. `` is one - of `branch`, `remoteBranch`, `tag`, `stash` or `HEAD` for local - branches, remote-tracking branches, tags, stash and HEAD, respectively - and `grafted` for grafted commits. - -color.grep:: - When set to `always`, always highlight matches. When `false` (or - `never`), never. When set to `true` or `auto`, use color only - when the output is written to the terminal. If unset, then the - value of `color.ui` is used (`auto` by default). - -color.grep.:: - Use customized color for grep colorization. `` specifies which - part of the line to use the specified color, and is one of -+ --- -`context`;; - non-matching text in context lines (when using `-A`, `-B`, or `-C`) -`filename`;; - filename prefix (when not using `-h`) -`function`;; - function name lines (when using `-p`) -`lineNumber`;; - line number prefix (when using `-n`) -`column`;; - column number prefix (when using `--column`) -`match`;; - matching text (same as setting `matchContext` and `matchSelected`) -`matchContext`;; - matching text in context lines -`matchSelected`;; - matching text in selected lines -`selected`;; - non-matching text in selected lines -`separator`;; - separators between fields on a line (`:`, `-`, and `=`) - and between hunks (`--`) --- - -color.interactive:: - When set to `always`, always use colors for interactive prompts - and displays (such as those used by "git-add --interactive" and - "git-clean --interactive"). When false (or `never`), never. - When set to `true` or `auto`, use colors only when the output is - to the terminal. If unset, then the value of `color.ui` is - used (`auto` by default). - -color.interactive.:: - Use customized color for 'git add --interactive' and 'git clean - --interactive' output. `` may be `prompt`, `header`, `help` - or `error`, for four distinct types of normal output from - interactive commands. - -color.pager:: - A boolean to enable/disable colored output when the pager is in - use (default is true). - -color.push:: - A boolean to enable/disable color in push errors. May be set to - `always`, `false` (or `never`) or `auto` (or `true`), in which - case colors are used only when the error output goes to a terminal. - If unset, then the value of `color.ui` is used (`auto` by default). - -color.push.error:: - Use customized color for push errors. - -color.remote:: - If set, keywords at the start of the line are highlighted. The - keywords are "error", "warning", "hint" and "success", and are - matched case-insensitively. May be set to `always`, `false` (or - `never`) or `auto` (or `true`). If unset, then the value of - `color.ui` is used (`auto` by default). - -color.remote.:: - Use customized color for each remote keyword. `` may be - `hint`, `warning`, `success` or `error` which match the - corresponding keyword. - -color.showBranch:: - A boolean to enable/disable color in the output of - linkgit:git-show-branch[1]. May be set to `always`, - `false` (or `never`) or `auto` (or `true`), in which case colors are used - only when the output is to a terminal. If unset, then the - value of `color.ui` is used (`auto` by default). - -color.status:: - A boolean to enable/disable color in the output of - linkgit:git-status[1]. May be set to `always`, - `false` (or `never`) or `auto` (or `true`), in which case colors are used - only when the output is to a terminal. If unset, then the - value of `color.ui` is used (`auto` by default). - -color.status.:: - Use customized color for status colorization. `` is - one of `header` (the header text of the status message), - `added` or `updated` (files which are added but not committed), - `changed` (files which are changed but not added in the index), - `untracked` (files which are not tracked by Git), - `branch` (the current branch), - `nobranch` (the color the 'no branch' warning is shown in, defaulting - to red), - `localBranch` or `remoteBranch` (the local and remote branch names, - respectively, when branch and tracking information is displayed in the - status short-format), or - `unmerged` (files which have unmerged changes). - -color.transport:: - A boolean to enable/disable color when pushes are rejected. May be - set to `always`, `false` (or `never`) or `auto` (or `true`), in which - case colors are used only when the error output goes to a terminal. - If unset, then the value of `color.ui` is used (`auto` by default). - -color.transport.rejected:: - Use customized color when a push was rejected. - -color.ui:: - This variable determines the default value for variables such - as `color.diff` and `color.grep` that control the use of color - per command family. Its scope will expand as more commands learn - configuration to set a default for the `--color` option. Set it - to `false` or `never` if you prefer Git commands not to use - color unless enabled explicitly with some other configuration - or the `--color` option. Set it to `always` if you want all - output not intended for machine consumption to use color, to - `true` or `auto` (this is the default since Git 1.8.4) if you - want such output to use color when written to the terminal. +include::color-config.txt[] column.ui:: Specify whether supported commands should output in columns. From patchwork Sat Oct 20 12:38:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650423 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 DFD3990 for ; Sat, 20 Oct 2018 12:39:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CA2AD2861D for ; Sat, 20 Oct 2018 12:39:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BE7DE28620; Sat, 20 Oct 2018 12:39:15 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 57F202861D for ; Sat, 20 Oct 2018 12:39:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727518AbeJTUte (ORCPT ); Sat, 20 Oct 2018 16:49:34 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:44790 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727289AbeJTUtd (ORCPT ); Sat, 20 Oct 2018 16:49:33 -0400 Received: by mail-lj1-f193.google.com with SMTP id v6-v6so33058133ljc.11 for ; Sat, 20 Oct 2018 05:39:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=adnGBkQE5hEj+othxFloSyP1k6ObcmtONZhYM4G5mEk=; b=VV+g/fVdoDG4vmwmWA9nViBodxgBd4u3+qICRpUaH2Jn4zcmllcItVP0Cb1Fa2EIBE ic/hmt/+PCDqQFsk6SbVdfO6JaXrxjQoRSVaa1KmZt+2nTmPvfW+HsNN8DE4zad13HqK eSLVEQjW4NoUgna3hjx37TsZfCK7CqoHcUSakE7G5Iu0Vvi5oOL9vBMqaWcIKTLwOzEQ mcxQdn6gxVR/gAKUON3F9fYjhuadXpPGrqF9AkWJP+ACHdPmH4EwiUFAmTinxmcOQp9S fq+QM8ORmrW2WIS+/2RcCBKuC8sDva0EHf2+F7kIBfWF4TMJCp1e8sLhemXZgxU98GMl ThQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=adnGBkQE5hEj+othxFloSyP1k6ObcmtONZhYM4G5mEk=; b=bublV8lpCAb4udspNfsOGteaZZI6edInbMScYKbQ1Rh6rsPv5g92KzBmCTPhxJwiFv eMtNP1ug7s0dZYANrIEMln355mvkYgRDg22dop6ig7YLpjeL25+qo0gSTLoFnPJ9GWN5 WScasQSFaICe0XrWbcw0eb8MsDyz06GlAzgTcepYHu2wF3vrfKuzcpqJzlPRBuHa4aqK Kkv+/AWig77puChX2+qXA29JWrrO6w5RJb0HnqOZP5QLUmIR2U4K7pHJJu3nAgEAUxCD 7Bj3FyzDxvfnTkNC8GieGuEKZizcDxGGbcvBoib8wmLCdaNv4L8E3i2Hn4L3lrAwrPBe qitg== X-Gm-Message-State: ABuFfoh7VlUW+fRI7+o3JoYH8aPZBk8RskDE/x08Ub0NVekUVzIoSuEq tnRskTUh43nTq1Y6LUHd5y1EqoXp X-Google-Smtp-Source: ACcGV61YJSQ3x9W/80ymF3ztKDGtz35PqFTKyBTzj3VKbm66I6DdcblVzl210r6ai3Eln5U12H04SA== X-Received: by 2002:a2e:9b8a:: with SMTP id z10-v6mr8636148lji.55.1540039150741; Sat, 20 Oct 2018 05:39:10 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:10 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 13/59] config.txt: move column.* to a separate file Date: Sat, 20 Oct 2018 14:38:02 +0200 Message-Id: <20181020123848.2785-14-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/column-config.txt | 55 ++++++++++++++++++++++++++++++++ Documentation/config.txt | 56 +-------------------------------- 2 files changed, 56 insertions(+), 55 deletions(-) create mode 100644 Documentation/column-config.txt diff --git a/Documentation/column-config.txt b/Documentation/column-config.txt new file mode 100644 index 0000000000..76aa2f29dc --- /dev/null +++ b/Documentation/column-config.txt @@ -0,0 +1,55 @@ +column.ui:: + Specify whether supported commands should output in columns. + This variable consists of a list of tokens separated by spaces + or commas: ++ +These options control when the feature should be enabled +(defaults to 'never'): ++ +-- +`always`;; + always show in columns +`never`;; + never show in columns +`auto`;; + show in columns if the output is to the terminal +-- ++ +These options control layout (defaults to 'column'). Setting any +of these implies 'always' if none of 'always', 'never', or 'auto' are +specified. ++ +-- +`column`;; + fill columns before rows +`row`;; + fill rows before columns +`plain`;; + show in one column +-- ++ +Finally, these options can be combined with a layout option (defaults +to 'nodense'): ++ +-- +`dense`;; + make unequal size columns to utilize more space +`nodense`;; + make equal size columns +-- + +column.branch:: + Specify whether to output branch listing in `git branch` in columns. + See `column.ui` for details. + +column.clean:: + Specify the layout when list items in `git clean -i`, which always + shows files and directories in columns. See `column.ui` for details. + +column.status:: + Specify whether to output untracked files in `git status` in columns. + See `column.ui` for details. + +column.tag:: + Specify whether to output tag listing in `git tag` in columns. + See `column.ui` for details. diff --git a/Documentation/config.txt b/Documentation/config.txt index 9e2c6c292b..48ce01f596 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -311,61 +311,7 @@ include::clean-config.txt[] include::color-config.txt[] -column.ui:: - Specify whether supported commands should output in columns. - This variable consists of a list of tokens separated by spaces - or commas: -+ -These options control when the feature should be enabled -(defaults to 'never'): -+ --- -`always`;; - always show in columns -`never`;; - never show in columns -`auto`;; - show in columns if the output is to the terminal --- -+ -These options control layout (defaults to 'column'). Setting any -of these implies 'always' if none of 'always', 'never', or 'auto' are -specified. -+ --- -`column`;; - fill columns before rows -`row`;; - fill rows before columns -`plain`;; - show in one column --- -+ -Finally, these options can be combined with a layout option (defaults -to 'nodense'): -+ --- -`dense`;; - make unequal size columns to utilize more space -`nodense`;; - make equal size columns --- - -column.branch:: - Specify whether to output branch listing in `git branch` in columns. - See `column.ui` for details. - -column.clean:: - Specify the layout when list items in `git clean -i`, which always - shows files and directories in columns. See `column.ui` for details. - -column.status:: - Specify whether to output untracked files in `git status` in columns. - See `column.ui` for details. - -column.tag:: - Specify whether to output tag listing in `git tag` in columns. - See `column.ui` for details. +include::column-config.txt[] commit.cleanup:: This setting overrides the default of the `--cleanup` option in From patchwork Sat Oct 20 12:38:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650425 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 1D4AD112B for ; Sat, 20 Oct 2018 12:39:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 079482861D for ; Sat, 20 Oct 2018 12:39:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F004028620; Sat, 20 Oct 2018 12:39:16 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 706DA2861D for ; Sat, 20 Oct 2018 12:39:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727523AbeJTUtf (ORCPT ); Sat, 20 Oct 2018 16:49:35 -0400 Received: from mail-lf1-f66.google.com ([209.85.167.66]:33710 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727512AbeJTUtd (ORCPT ); Sat, 20 Oct 2018 16:49:33 -0400 Received: by mail-lf1-f66.google.com with SMTP id o21-v6so27164496lfe.0 for ; Sat, 20 Oct 2018 05:39:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RkmNsw8bBjBhQ3blW5PQot4XFWLRel82tuhZwJvw2Yw=; b=oBwhBo6D8eo3qozLo1gVNBa06zPmJOhmDQE83dGBmQHWbYPUBckwxOtKpgJEfhZ5Qe oubU/HpPRv3uS6EQ4Lw11hZ2t7OOkC9Cdr2iGxXH7tTvoQxPHBhsLVfGxiOutGlGEYFZ yOnTfHub4IbAdKfSDbda94WHgoYb2kT0o5hHnTC9wmC245NeVI2anfzjckjE95q/9bup irBMoT2aKbLgLBTVJuPB0/zIH1++fs5O5hVQkitE1IVYNMQyQ47/J56ayreeV1XJhNYk bVLPGcAmj79xT4ArVlY6EAXlxqhidZ3N3OWkAD4MJyq2GVB2/5MkSFLGrZ9tlwM6d+kA wvpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RkmNsw8bBjBhQ3blW5PQot4XFWLRel82tuhZwJvw2Yw=; b=hdo1IVhyN98rvCXC4O0ctwWTbJ8v6cvcM+Y6/+VmvD0zlQ0nTzrn2yFJgeE+NhbFlI EZ//7aJu3AUecituv2iYX2PTZ/LgVfFOMFhbFnxDgS6Gwb6FzcNHLO3rdPNZeS9JfTwc scjH9xdQqdynoxqkypgMWi7wLQAGn5NiUGh7g3bCUKEv0tk0VHFKvF3MvS/ZKm3PKIXU 0JG2wqYHWAYXhr0nDe9eyP+zBh5tB78QmUw2zDyaS3+jDcHXHJWVEw1504naMDccCPWq d9+dyLrgLbopHmG+tLtSe0Cg3JRU7gXYcixR5jkhSGX+J4lprCETRkUnD7fd2DmZwSQQ l4wQ== X-Gm-Message-State: ABuFfoitqsayyritgAlfv4px2Fm7+VsORNv6kDbSAiGlqI6viDWBTe14 iu8l//cC6rD+BHXhArhjbsNcRgEO X-Google-Smtp-Source: ACcGV60bVwo1/EgIwG41PmOrBy3OGdNQDdk1axthT6D/qXj6aemHlHpQ7aR0aQkDzFvCH0r7Pa/Fhw== X-Received: by 2002:a19:db84:: with SMTP id t4-v6mr5237651lfi.74.1540039151842; Sat, 20 Oct 2018 05:39:11 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:11 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 14/59] config.txt: move commit.* to a separate file Date: Sat, 20 Oct 2018 14:38:03 +0200 Message-Id: <20181020123848.2785-15-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/commit-config.txt | 29 +++++++++++++++++++++++++++++ Documentation/config.txt | 30 +----------------------------- 2 files changed, 30 insertions(+), 29 deletions(-) create mode 100644 Documentation/commit-config.txt diff --git a/Documentation/commit-config.txt b/Documentation/commit-config.txt new file mode 100644 index 0000000000..2c95573930 --- /dev/null +++ b/Documentation/commit-config.txt @@ -0,0 +1,29 @@ +commit.cleanup:: + This setting overrides the default of the `--cleanup` option in + `git commit`. See linkgit:git-commit[1] for details. Changing the + default can be useful when you always want to keep lines that begin + with comment character `#` in your log message, in which case you + would do `git config commit.cleanup whitespace` (note that you will + have to remove the help lines that begin with `#` in the commit log + template yourself, if you do this). + +commit.gpgSign:: + + A boolean to specify whether all commits should be GPG signed. + Use of this option when doing operations such as rebase can + result in a large number of commits being signed. It may be + convenient to use an agent to avoid typing your GPG passphrase + several times. + +commit.status:: + A boolean to enable/disable inclusion of status information in the + commit message template when using an editor to prepare the commit + message. Defaults to true. + +commit.template:: + Specify the pathname of a file to use as the template for + new commit messages. + +commit.verbose:: + A boolean or int to specify the level of verbose with `git commit`. + See linkgit:git-commit[1]. diff --git a/Documentation/config.txt b/Documentation/config.txt index 48ce01f596..59cae6a895 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -313,35 +313,7 @@ include::color-config.txt[] include::column-config.txt[] -commit.cleanup:: - This setting overrides the default of the `--cleanup` option in - `git commit`. See linkgit:git-commit[1] for details. Changing the - default can be useful when you always want to keep lines that begin - with comment character `#` in your log message, in which case you - would do `git config commit.cleanup whitespace` (note that you will - have to remove the help lines that begin with `#` in the commit log - template yourself, if you do this). - -commit.gpgSign:: - - A boolean to specify whether all commits should be GPG signed. - Use of this option when doing operations such as rebase can - result in a large number of commits being signed. It may be - convenient to use an agent to avoid typing your GPG passphrase - several times. - -commit.status:: - A boolean to enable/disable inclusion of status information in the - commit message template when using an editor to prepare the commit - message. Defaults to true. - -commit.template:: - Specify the pathname of a file to use as the template for - new commit messages. - -commit.verbose:: - A boolean or int to specify the level of verbose with `git commit`. - See linkgit:git-commit[1]. +include::commit-config.txt[] credential.helper:: Specify an external helper to be called when a username or From patchwork Sat Oct 20 12:38:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650429 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 6B20C90 for ; Sat, 20 Oct 2018 12:39:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5575A2861D for ; Sat, 20 Oct 2018 12:39:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 49F1428620; Sat, 20 Oct 2018 12:39:19 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 DE31C2861D for ; Sat, 20 Oct 2018 12:39:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727537AbeJTUth (ORCPT ); Sat, 20 Oct 2018 16:49:37 -0400 Received: from mail-lf1-f67.google.com ([209.85.167.67]:35517 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727512AbeJTUtg (ORCPT ); Sat, 20 Oct 2018 16:49:36 -0400 Received: by mail-lf1-f67.google.com with SMTP id d7-v6so6542058lfi.2 for ; Sat, 20 Oct 2018 05:39:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eYcpCekynwGlnlENHCbdzJJKziBsNILv8kiuOHJXZtQ=; b=Q35T1Hkabbh9NiTpjBYQajxfVAUVwpXaDCB1NTQtCqyTRy/0s1geAg1bqrHSy/Ztvr wmrHHhDvLMolBUltw3FNIW5lzV9+wlsb6UnC9IiaUP21MYm1EDZ1b386ZJWANU7n0NNM KxXkZqf5geKPvNX8GwyDt+t4YtHFbmy/Vi/LSqlqwMEXYF7GbJVRQg4vi6Z/jQx8w5EX 3etK8NH13G/Gx+JVkE5opcH4v/RwVJdUjHVRGJXi2I6wix7myhcUC7YBPPRLlqKZ78Ie X7SIVr7D3SGIjTvdT9CnwPoahikoh2ak1C6DsxAkefRFWBn/74gCGVMrPXkjLcuvZKse 66ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eYcpCekynwGlnlENHCbdzJJKziBsNILv8kiuOHJXZtQ=; b=ngINUwuyLQCQIKj9tsnRp8Zv2nWIu0+mEXTZruF4KpyPHAXjoZ29ZjF52mPDIKISSS elSDWErpiXSJa0bXlJ+r/LL7HAr4wYDijX7v8mD/P6l9higDdRhlyQUWRECMz47JwNmd sM7Zni5C0xv3xPGiSGPTsBUeykm8qJ4DGTbQh4hTIvuLJb4aDqO13OgZl3Pg03jU/2Sh INPw4rEkxweECy+OELrE0SSYiFWDkOo4/2gi/FPiVhsr7q64o71GF6iPuUMpOKt1hH22 5ql9+E+oDDNSVtLiQbv+JE9/8RZuMFqJlzRVjl5OUMVzs8oMzmY7PnmgXYC3YnVpum3E ug2w== X-Gm-Message-State: ABuFfohXXszduas6Snpd8SCvV7Cg4Fhr2T1dGaeDL4h0AD4by/PABKG0 0eHEbYcDBAHYZDtVOHmNlPCfuxoJ X-Google-Smtp-Source: ACcGV63niHpM3QV5nMrqnCnbMuHV6iizFan36VInHYn971ou1wchIKCgQUDUHWKGVOumeaKEkhSZqw== X-Received: by 2002:a19:111b:: with SMTP id g27mr5682869lfi.135.1540039154346; Sat, 20 Oct 2018 05:39:14 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:13 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 15/59] config.txt: move credential.* to a separate file Date: Sat, 20 Oct 2018 14:38:04 +0200 Message-Id: <20181020123848.2785-16-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 27 +-------------------------- Documentation/credential-config.txt | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 26 deletions(-) create mode 100644 Documentation/credential-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 59cae6a895..36a8d120be 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -315,32 +315,7 @@ include::column-config.txt[] include::commit-config.txt[] -credential.helper:: - Specify an external helper to be called when a username or - password credential is needed; the helper may consult external - storage to avoid prompting the user for the credentials. Note - that multiple helpers may be defined. See linkgit:gitcredentials[7] - for details. - -credential.useHttpPath:: - When acquiring credentials, consider the "path" component of an http - or https URL to be important. Defaults to false. See - linkgit:gitcredentials[7] for more information. - -credential.username:: - If no username is set for a network authentication, use this username - by default. See credential..* below, and - linkgit:gitcredentials[7]. - -credential..*:: - Any of the credential.* options above can be applied selectively to - some credentials. For example "credential.https://example.com.username" - would set the default username only for https connections to - example.com. See linkgit:gitcredentials[7] for details on how URLs are - matched. - -credentialCache.ignoreSIGHUP:: - Tell git-credential-cache--daemon to ignore SIGHUP, instead of quitting. +include::credential-config.txt[] completion.commands:: This is only used by git-completion.bash to add or remove diff --git a/Documentation/credential-config.txt b/Documentation/credential-config.txt new file mode 100644 index 0000000000..60fb3189e1 --- /dev/null +++ b/Documentation/credential-config.txt @@ -0,0 +1,26 @@ +credential.helper:: + Specify an external helper to be called when a username or + password credential is needed; the helper may consult external + storage to avoid prompting the user for the credentials. Note + that multiple helpers may be defined. See linkgit:gitcredentials[7] + for details. + +credential.useHttpPath:: + When acquiring credentials, consider the "path" component of an http + or https URL to be important. Defaults to false. See + linkgit:gitcredentials[7] for more information. + +credential.username:: + If no username is set for a network authentication, use this username + by default. See credential..* below, and + linkgit:gitcredentials[7]. + +credential..*:: + Any of the credential.* options above can be applied selectively to + some credentials. For example "credential.https://example.com.username" + would set the default username only for https connections to + example.com. See linkgit:gitcredentials[7] for details on how URLs are + matched. + +credentialCache.ignoreSIGHUP:: + Tell git-credential-cache--daemon to ignore SIGHUP, instead of quitting. From patchwork Sat Oct 20 12:38:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650431 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 B221390 for ; Sat, 20 Oct 2018 12:39:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9DE402861D for ; Sat, 20 Oct 2018 12:39:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 921C228623; Sat, 20 Oct 2018 12:39:20 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 441AC2861D for ; Sat, 20 Oct 2018 12:39:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727543AbeJTUtj (ORCPT ); Sat, 20 Oct 2018 16:49:39 -0400 Received: from mail-lf1-f66.google.com ([209.85.167.66]:46851 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727473AbeJTUti (ORCPT ); Sat, 20 Oct 2018 16:49:38 -0400 Received: by mail-lf1-f66.google.com with SMTP id p143-v6so16100381lfp.13 for ; Sat, 20 Oct 2018 05:39:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4rbWNr/yDU7x3TgHPpIIG3YYq0DWD5OPl5Mbka/IRKQ=; b=hR3pEkoonC+5jFLvIdqbwJuO6+SkMGO2twT8qXpn7rLeT1j3Y6tkZxRAn+/0Bb7jmw 32h6kLkiSXLczXFunaNPG4SR2qOs2u4jMZSP3hW4uZ3tgbbhvz7zLVyuYsAfliX9QAAa S0to9lgtd+qzgELQ4IBnVbMSeLI/aTJMIkYPPgLzQtd67ubKsixJ1fml7XeEJHDlFmV8 B4hlttjrxIDtp4j/PUgX2RRvLlDpj0eoD7eLEgxP9UyyeJVCdCJqyD9MllDZU+jVeuUs Gzk9FIPyJh7X/4d83k0EKmrXu8bC+NKJFmnH+U61CUB2W+gaYZbgUwCjqiwwLr13lE+u sr0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4rbWNr/yDU7x3TgHPpIIG3YYq0DWD5OPl5Mbka/IRKQ=; b=KBF+hkJFdlN4V/bDRqUFBgibCzWE0kbwahCaFwgbqm+VlOgBlOrYDbGlpjFSPUL5XD GH6+LyMze2xGfp+ie5b+HMxkR8FTyShZBhaWjOechp6fMOJWvW68fAGNh0PUsXGBXm6J RDYemgAsPb8IQUk7DGHIB7jlBXz2jixSyfD/p6pvYcGXuTgjrsjeOfeUQwZ3lQbZ9vFg zcVamcfdfKGnuLzKJQ1o3ws8CWRjqRWWUgGazTMyQvebCQKOouJVlkWu5BXfLIEn38qd m21eDljj63QYWmRaHOUFONxLcuaKkx8Zaaqz/lCJ64FewNbaFCWBbP7e+b7LJJcC2mZd TCzQ== X-Gm-Message-State: ABuFfojSVth9irlJww5dyk9NvtLTZXLGkxG2Iwo62qXNb2bPHDRmPI9O 7KUgIzXurk/tv/OYljxgJUmbirtq X-Google-Smtp-Source: ACcGV60oeoT3U0uZDYCZ9ozqg+LYTcbyh/nJa3ttsiBjyZSoW7GhLZo431UM9c07NPUXkpQ/17Vs+g== X-Received: by 2002:a19:d999:: with SMTP id s25-v6mr5244329lfi.122.1540039155344; Sat, 20 Oct 2018 05:39:15 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:14 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 16/59] config.txt: move completion.* to a separate file Date: Sat, 20 Oct 2018 14:38:05 +0200 Message-Id: <20181020123848.2785-17-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/completion-config.txt | 7 +++++++ Documentation/config.txt | 8 +------- 2 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 Documentation/completion-config.txt diff --git a/Documentation/completion-config.txt b/Documentation/completion-config.txt new file mode 100644 index 0000000000..4d99bf33c9 --- /dev/null +++ b/Documentation/completion-config.txt @@ -0,0 +1,7 @@ +completion.commands:: + This is only used by git-completion.bash to add or remove + commands from the list of completed commands. Normally only + porcelain commands and a few select others are completed. You + can add more commands, separated by space, in this + variable. Prefixing the command with '-' will remove it from + the existing list. diff --git a/Documentation/config.txt b/Documentation/config.txt index 36a8d120be..d1509dd25e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -317,13 +317,7 @@ include::commit-config.txt[] include::credential-config.txt[] -completion.commands:: - This is only used by git-completion.bash to add or remove - commands from the list of completed commands. Normally only - porcelain commands and a few select others are completed. You - can add more commands, separated by space, in this - variable. Prefixing the command with '-' will remove it from - the existing list. +include::completion-config.txt[] include::diff-config.txt[] From patchwork Sat Oct 20 12:38:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650433 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 F0B3C17D4 for ; Sat, 20 Oct 2018 12:39:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA8402861D for ; Sat, 20 Oct 2018 12:39:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CEEE928620; Sat, 20 Oct 2018 12:39:20 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 689A42861E for ; Sat, 20 Oct 2018 12:39:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727546AbeJTUtj (ORCPT ); Sat, 20 Oct 2018 16:49:39 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:40839 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727531AbeJTUtj (ORCPT ); Sat, 20 Oct 2018 16:49:39 -0400 Received: by mail-lj1-f195.google.com with SMTP id r83-v6so33086507ljr.7 for ; Sat, 20 Oct 2018 05:39:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kmZc/ioNqREdJ93qnMcNG6ezpJI8mT09GpEeyQ9cjxE=; b=C1TKQwtH2WudNyySwHgI3j0cxtuSU46pnKfbpjJMJV11tHyYl+VNj4vULCBKCZQqTv TmAtX0YUeQBtPoSlflYhjQoqFSbT3mmpa1DAr/bcpoa/6eHko+3UrxJu3WwjfVHFQqmV Z+I1Ul5Aym5KLpoe9iXILKGcYhWOn2GVjC6cV2ROAduoBlAzhSaXCCSZHsfWaLPjuw7+ UPryqaFVsRAUpRc1gjyqbzR0KplnOORVgt7tcQl/qm1KMpw+a7+8w3u1d5577C4e6dhM X+cqD6eEwBoatA5GJNPYyH3cbDtL6ab4vWYXiO/g9+Oyo6EcvGlAXzSXqm8KCMGT58CL QTZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kmZc/ioNqREdJ93qnMcNG6ezpJI8mT09GpEeyQ9cjxE=; b=Cp1Wo/YGFwWZW5/7zHi4fMKpkfvqGCi0i95ZfCZeScQOgJdWgqVcGxRxr+TuuS0QlZ u3XwixiCS5d0yWYlPy8D0Qb/lsXgO64G2mravm1vWZFTGnWm5bts/g8lF7B5KsUUd2fS AJGol5BvrfLaDAgrzfFeqVepy0WPejebS+DH1Y19VyDvX2xBtC2MkHTWJhR99pxM3P0d D+y5V2KL4p2hXdL9StnbU77CK4Cx6vS6zTiZDPpLCFuCcSIWGlbQDcIpN+oBKlah6O7K deZWIA+BDYCl+3nMfRNBvY2VlYbU/NiNdIgsF6UeNT0bIMieCDanKRFGJhWLCkbOV2sO jKWw== X-Gm-Message-State: AGRZ1gL8h57QljeAE+BOPDXlZcYnmg6EnbHThjsMaaA3RX7h/PcXeqWW GLCaYI886sTjGBK7xlEwWYzwpr1m X-Google-Smtp-Source: AJdET5d9rghvO5ZJQOO/Of6Su4kTkGvE5SW5ysz5NqF9VtV153GcWts+kfA0my7ER3wZKRE6G5dN2A== X-Received: by 2002:a2e:c52:: with SMTP id o18-v6mr899914ljd.94.1540039156300; Sat, 20 Oct 2018 05:39:16 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:15 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 17/59] config.txt: move difftool.* to a separate file Date: Sat, 20 Oct 2018 14:38:06 +0200 Message-Id: <20181020123848.2785-18-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 15 +-------------- Documentation/difftool-config.txt | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 Documentation/difftool-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index d1509dd25e..f38e0a8334 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -321,20 +321,7 @@ include::completion-config.txt[] include::diff-config.txt[] -difftool..path:: - Override the path for the given tool. This is useful in case - your tool is not in the PATH. - -difftool..cmd:: - Specify the command to invoke the specified diff tool. - The specified command is evaluated in shell with the following - variables available: 'LOCAL' is set to the name of the temporary - file containing the contents of the diff pre-image and 'REMOTE' - is set to the name of the temporary file containing the contents - of the diff post-image. - -difftool.prompt:: - Prompt before each invocation of the diff tool. +include::difftool-config.txt[] fastimport.unpackLimit:: If the number of objects imported by linkgit:git-fast-import[1] diff --git a/Documentation/difftool-config.txt b/Documentation/difftool-config.txt new file mode 100644 index 0000000000..6762594480 --- /dev/null +++ b/Documentation/difftool-config.txt @@ -0,0 +1,14 @@ +difftool..path:: + Override the path for the given tool. This is useful in case + your tool is not in the PATH. + +difftool..cmd:: + Specify the command to invoke the specified diff tool. + The specified command is evaluated in shell with the following + variables available: 'LOCAL' is set to the name of the temporary + file containing the contents of the diff pre-image and 'REMOTE' + is set to the name of the temporary file containing the contents + of the diff post-image. + +difftool.prompt:: + Prompt before each invocation of the diff tool. From patchwork Sat Oct 20 12:38:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650435 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 4F43590 for ; Sat, 20 Oct 2018 12:39:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 39DE42861D for ; Sat, 20 Oct 2018 12:39:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2E6B428620; Sat, 20 Oct 2018 12:39:23 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 D1B122861D for ; Sat, 20 Oct 2018 12:39:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727553AbeJTUtl (ORCPT ); Sat, 20 Oct 2018 16:49:41 -0400 Received: from mail-lf1-f66.google.com ([209.85.167.66]:45144 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727512AbeJTUtk (ORCPT ); Sat, 20 Oct 2018 16:49:40 -0400 Received: by mail-lf1-f66.google.com with SMTP id c24-v6so676687lfi.12 for ; Sat, 20 Oct 2018 05:39:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ml68f6u01c9XT24VWXplI91hzjb44bzeL+cW9QJ2uCo=; b=JuJGpOetBUJSUOsw8sgUZ5DDrpFy5Q6AwSMUxbbd/sLFlvwaeXTz+gfK8w7LDkt7SR 4WkwFd/j558djEeyq6yS3CkTEF4F1haCCGnJNgf4smhdVbEIfYfpW1vMomCmt1nHhCKg 1uiqfIVlrSuYuh4uOBVL2R/eiL5MIhuQqiKh+A8vthRdH++PjYQT6iAk2NS6De3eIN0R ETz4gWhC99OPpwLNFfR9Rmgchx5uyb/ymfABCqR/Y7xdb6n50QvgTGtR1ybRkl5JBXRk Lw6N8IiUTJmdhNteuZ/d2zAuTWEkTIkMLxNP7q0MGsms3tF9P1KXEQxXurnljdf7pVm7 r+Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ml68f6u01c9XT24VWXplI91hzjb44bzeL+cW9QJ2uCo=; b=nN6Y3E7E4IIrxgq1tJqpINe+rm+OczUXzyPBjAdrTGo5YfI3Phc7jDpwW6WzWIqRRI /hth7aj0+VLkdOefBbPhk+FTSBJvGd3ua3airGEkx46lL3bkZLak3nr4ZB7xD3DQMHdt ng1HgtfO4jeaicM1pzUGKelwouHkOqvQbe62b12o5SadEaZOZ09oleHV43fSZsBErqbK Vg1Z/tADVd65K1rVJTfQRjqtK2i5kR1t5tFcYSvrcyzBdonvMJNVQyep5KWyaAIk3gqQ E7pakPt3cs6ZuzLVGzFtlsQGfFepYKdDI8OQn79yAD4oYFMGkz2rGnfwCXe8LW7QBkt/ j5Eg== X-Gm-Message-State: ABuFfohxQNQLlHZltUsPbHj1a9+RtSJTXYecwBsf5vae2/nbyWBnxp7i 2fOmAb8qPTBMsh+Lozd455tOkkvh X-Google-Smtp-Source: ACcGV63UAQofmShkiUBRwmxWJHegEpoDChI5Rs1Zs3fuSz01sa0cFN08WRejv1Vao04+K41Iq5VAxg== X-Received: by 2002:a19:ee08:: with SMTP id g8mr1091470lfb.72.1540039158030; Sat, 20 Oct 2018 05:39:18 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:17 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 18/59] config.txt: move fastimport.* to a separate file Date: Sat, 20 Oct 2018 14:38:07 +0200 Message-Id: <20181020123848.2785-19-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 9 +-------- Documentation/fastimport-config.txt | 8 ++++++++ 2 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 Documentation/fastimport-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index f38e0a8334..66791f0918 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -323,14 +323,7 @@ include::diff-config.txt[] include::difftool-config.txt[] -fastimport.unpackLimit:: - If the number of objects imported by linkgit:git-fast-import[1] - is below this limit, then the objects will be unpacked into - loose object files. However if the number of imported objects - equals or exceeds this limit then the pack will be stored as a - pack. Storing the pack from a fast-import can make the import - operation complete faster, especially on slow filesystems. If - not set, the value of `transfer.unpackLimit` is used instead. +include::fastimport-config.txt[] include::fetch-config.txt[] diff --git a/Documentation/fastimport-config.txt b/Documentation/fastimport-config.txt new file mode 100644 index 0000000000..c1166e330d --- /dev/null +++ b/Documentation/fastimport-config.txt @@ -0,0 +1,8 @@ +fastimport.unpackLimit:: + If the number of objects imported by linkgit:git-fast-import[1] + is below this limit, then the objects will be unpacked into + loose object files. However if the number of imported objects + equals or exceeds this limit then the pack will be stored as a + pack. Storing the pack from a fast-import can make the import + operation complete faster, especially on slow filesystems. If + not set, the value of `transfer.unpackLimit` is used instead. From patchwork Sat Oct 20 12:38:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650437 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 B590C17D4 for ; Sat, 20 Oct 2018 12:39:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A15ED2861D for ; Sat, 20 Oct 2018 12:39:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9625C28620; Sat, 20 Oct 2018 12:39:23 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 4915F2861E for ; Sat, 20 Oct 2018 12:39:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727565AbeJTUtm (ORCPT ); Sat, 20 Oct 2018 16:49:42 -0400 Received: from mail-lf1-f67.google.com ([209.85.167.67]:35522 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727531AbeJTUtl (ORCPT ); Sat, 20 Oct 2018 16:49:41 -0400 Received: by mail-lf1-f67.google.com with SMTP id d7-v6so6542126lfi.2 for ; Sat, 20 Oct 2018 05:39:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Zy78mJxw+JQMJ4FD8qmcUz2lhcQhL7o755G8d49fOnk=; b=Dw8z/skRQ+mu3S9rrzzH2uGjBC6R4ZyBjP9o+hKuLV0hfFJu2YAV7efX4qTvIa9TiY Uyl6dy8AM73bliuDSTcCTs71aWut+6XICDbU/fmIP0dUZ6Evygj8Y4VM+4H+J40MOOuE XGsL/uHhCvkBoc5yaYKV7DIrUxFo1gy1lIZYUvMGpV0HH87ViSHlQ+APeVqYtVSR2uE3 VYfyPbDkDJQ2pLLUq2ax5VXAID0oyyeqIwPY0olNEiEcI6OrLRfuT8WJA1G3nDYqm2n6 RH4NkwPpdqwZutx9Hek8SqCJnodtnGjRlXHqHN/YqjIkqKrie3tngOXGL8Fab/Jasuor 34yA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Zy78mJxw+JQMJ4FD8qmcUz2lhcQhL7o755G8d49fOnk=; b=AQNnG4WOJ6p+0gnPIDJpraXmnLi3T4aJCdzm0EXalrslX0vXTsKSMMYyljmIz9k0xq IUlJGHH29bqRrd2nanxLTaquOzmEd9kbH/3FKAI4f9l3hdDraL3Ga9kzz5Pof0JQTo+A xLjwCE4Azvda1BMw3srj8vLTrhyqIvTlMvl31DJ/FzBFGC+6OowvNW9NiN23JdtgwV+2 SnRgFaV8PHWYnDmoC7RVff6zDqMql5hp1eiEWphgBYj2klGe/501o0Y9wKilN/qMZXMo dzLw+bn7o7Q3jMY285s1CG4Lwp8yhasX76QfITZw66CClq7CBSHyqNEl7zWZdO+Z87/4 292Q== X-Gm-Message-State: ABuFfojSuC+Wk/DW/ej8it396mIo8Kzwo3tfihH4l7QVzEB4c01A6E0C /ZSrgYUriWpc0mz51bc0RGzIJXlM X-Google-Smtp-Source: ACcGV63/IdTNIz9ECrFBFN1+Pk1tpHj+Q0YbwdX5/1fbWCprxwEomXrRww1zMaxXGGUFaGRADAT1Iw== X-Received: by 2002:a19:f514:: with SMTP id j20-v6mr5271375lfb.13.1540039159345; Sat, 20 Oct 2018 05:39:19 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:18 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 19/59] config.txt: move filter.* to a separate file Date: Sat, 20 Oct 2018 14:38:08 +0200 Message-Id: <20181020123848.2785-20-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 10 +--------- Documentation/filter-config.txt | 9 +++++++++ 2 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 Documentation/filter-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 66791f0918..7c7dde188c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -329,15 +329,7 @@ include::fetch-config.txt[] include::format-config.txt[] -filter..clean:: - The command which is used to convert the content of a worktree - file to a blob upon checkin. See linkgit:gitattributes[5] for - details. - -filter..smudge:: - The command which is used to convert the content of a blob - object to a worktree file upon checkout. See - linkgit:gitattributes[5] for details. +include::filter-config.txt[] fsck.:: During fsck git may find issues with legacy data which diff --git a/Documentation/filter-config.txt b/Documentation/filter-config.txt new file mode 100644 index 0000000000..90dfe0ba5a --- /dev/null +++ b/Documentation/filter-config.txt @@ -0,0 +1,9 @@ +filter..clean:: + The command which is used to convert the content of a worktree + file to a blob upon checkin. See linkgit:gitattributes[5] for + details. + +filter..smudge:: + The command which is used to convert the content of a blob + object to a worktree file upon checkout. See + linkgit:gitattributes[5] for details. From patchwork Sat Oct 20 12:38:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650439 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 5F265112B for ; Sat, 20 Oct 2018 12:39:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 47C2C2861D for ; Sat, 20 Oct 2018 12:39:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3C58528620; Sat, 20 Oct 2018 12:39:26 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 85ABE2861D for ; Sat, 20 Oct 2018 12:39:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727579AbeJTUto (ORCPT ); Sat, 20 Oct 2018 16:49:44 -0400 Received: from mail-lf1-f67.google.com ([209.85.167.67]:36445 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727554AbeJTUtn (ORCPT ); Sat, 20 Oct 2018 16:49:43 -0400 Received: by mail-lf1-f67.google.com with SMTP id l1-v6so7358831lfc.3 for ; Sat, 20 Oct 2018 05:39:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JHFwp7npyrJnq8d2j50Ns3jaXWTqWH+WlzzX3aJF3rk=; b=brWqb2J7pMZmmX/C1RIROqM8O76aeQsA9K57EOJf7gSfKOqQxri1ketR6K4kwLBoYR tboqbEwOb3dGtmMxK6YxQb3BPk5Ci3hhjKky55JSS/9VqHU2PwOmG0LQ2IFJ39AzIm/g PG34ekhPZwYMcLWRM/EvRyn+yiSoDdWEkmH+5sp5osKGCyT7gMVU4GyUzFBs6D6LrmGi ULtqZh6VSLnRdldnaLBCTUMMrgToD/E8I7BGsB6lO8AprxllOJ3fr71xmfQX87FuuBxk PwzI2FEuSf2WG2NuUs3thT+iEqie98s7CJSYnnPRV90GVI6sZWxKLE/d/vHNPOzHNUyX XTGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JHFwp7npyrJnq8d2j50Ns3jaXWTqWH+WlzzX3aJF3rk=; b=o/EtX3kRuUMNlnCkBmyUCCOxW4L1nAmltcErkNoiRyifPRg12U/hS6P4WGp0D0y0ON Kq3CbU1Tm9LhpKR4NpaRZZR49/wZEmNKJ4/rWhl+pDZ5w008xD7nmZbv0VTomaSwbGiG 6QwfHchQSJoWyBWJFgmv+lQnixCEyxvgaO5vbUOU7ITn/wYT+d5fu1SwipEcDJf9bGIJ BQNaVBpffcQUa7CgsOeMPgH3ULImYQcSI9RB/Jl2Shv2XUyqXh4DOiUkADZAVFNG84KG AamwcLirVY9DvPWC6HAeMnor75o1q6FRFzcWaoVXeEKBOGLGIHYH9uH6fJ0/hjVlsSMN 20qQ== X-Gm-Message-State: ABuFfohhD+EnCsKfPBCj54pEh93M6FIDJQvzZHYaXTYX6n6zzaDdmfBa PUY3DM0udlCmnePn/gmAzrC87Jc7 X-Google-Smtp-Source: ACcGV62aYNhZhuq3ruHttxRAoVu6/QoX8uujKF57tOFUAkFk6+qa2F33cs5RU6gnn2XcEfdjjeM4fw== X-Received: by 2002:a19:ae11:: with SMTP id f17-v6mr5752632lfc.86.1540039160395; Sat, 20 Oct 2018 05:39:20 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:19 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 20/59] config.txt: move fsck.* to a separate file Date: Sat, 20 Oct 2018 14:38:09 +0200 Message-Id: <20181020123848.2785-21-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 68 +---------------------------------- Documentation/fsck-config.txt | 67 ++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 67 deletions(-) create mode 100644 Documentation/fsck-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 7c7dde188c..fa26cb1090 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -331,73 +331,7 @@ include::format-config.txt[] include::filter-config.txt[] -fsck.:: - During fsck git may find issues with legacy data which - wouldn't be generated by current versions of git, and which - wouldn't be sent over the wire if `transfer.fsckObjects` was - set. This feature is intended to support working with legacy - repositories containing such data. -+ -Setting `fsck.` will be picked up by linkgit:git-fsck[1], but -to accept pushes of such data set `receive.fsck.` instead, or -to clone or fetch it set `fetch.fsck.`. -+ -The rest of the documentation discusses `fsck.*` for brevity, but the -same applies for the corresponding `receive.fsck.*` and -`fetch..*`. variables. -+ -Unlike variables like `color.ui` and `core.editor` the -`receive.fsck.` and `fetch.fsck.` variables will not -fall back on the `fsck.` configuration if they aren't set. To -uniformly configure the same fsck settings in different circumstances -all three of them they must all set to the same values. -+ -When `fsck.` is set, errors can be switched to warnings and -vice versa by configuring the `fsck.` setting where the -`` is the fsck message ID and the value is one of `error`, -`warn` or `ignore`. For convenience, fsck prefixes the error/warning -with the message ID, e.g. "missingEmail: invalid author/committer line -- missing email" means that setting `fsck.missingEmail = ignore` will -hide that issue. -+ -In general, it is better to enumerate existing objects with problems -with `fsck.skipList`, instead of listing the kind of breakages these -problematic objects share to be ignored, as doing the latter will -allow new instances of the same breakages go unnoticed. -+ -Setting an unknown `fsck.` value will cause fsck to die, but -doing the same for `receive.fsck.` and `fetch.fsck.` -will only cause git to warn. - -fsck.skipList:: - The path to a list of object names (i.e. one unabbreviated SHA-1 per - line) that are known to be broken in a non-fatal way and should - be ignored. On versions of Git 2.20 and later comments ('#'), empty - lines, and any leading and trailing whitespace is ignored. Everything - but a SHA-1 per line will error out on older versions. -+ -This feature is useful when an established project should be accepted -despite early commits containing errors that can be safely ignored -such as invalid committer email addresses. Note: corrupt objects -cannot be skipped with this setting. -+ -Like `fsck.` this variable has corresponding -`receive.fsck.skipList` and `fetch.fsck.skipList` variants. -+ -Unlike variables like `color.ui` and `core.editor` the -`receive.fsck.skipList` and `fetch.fsck.skipList` variables will not -fall back on the `fsck.skipList` configuration if they aren't set. To -uniformly configure the same fsck settings in different circumstances -all three of them they must all set to the same values. -+ -Older versions of Git (before 2.20) documented that the object names -list should be sorted. This was never a requirement, the object names -could appear in any order, but when reading the list we tracked whether -the list was sorted for the purposes of an internal binary search -implementation, which could save itself some work with an already sorted -list. Unless you had a humongous list there was no reason to go out of -your way to pre-sort the list. After Git version 2.20 a hash implementation -is used instead, so there's now no reason to pre-sort the list. +include::fsck-config.txt[] gc.aggressiveDepth:: The depth parameter used in the delta compression diff --git a/Documentation/fsck-config.txt b/Documentation/fsck-config.txt new file mode 100644 index 0000000000..879c5a29c4 --- /dev/null +++ b/Documentation/fsck-config.txt @@ -0,0 +1,67 @@ +fsck.:: + During fsck git may find issues with legacy data which + wouldn't be generated by current versions of git, and which + wouldn't be sent over the wire if `transfer.fsckObjects` was + set. This feature is intended to support working with legacy + repositories containing such data. ++ +Setting `fsck.` will be picked up by linkgit:git-fsck[1], but +to accept pushes of such data set `receive.fsck.` instead, or +to clone or fetch it set `fetch.fsck.`. ++ +The rest of the documentation discusses `fsck.*` for brevity, but the +same applies for the corresponding `receive.fsck.*` and +`fetch..*`. variables. ++ +Unlike variables like `color.ui` and `core.editor` the +`receive.fsck.` and `fetch.fsck.` variables will not +fall back on the `fsck.` configuration if they aren't set. To +uniformly configure the same fsck settings in different circumstances +all three of them they must all set to the same values. ++ +When `fsck.` is set, errors can be switched to warnings and +vice versa by configuring the `fsck.` setting where the +`` is the fsck message ID and the value is one of `error`, +`warn` or `ignore`. For convenience, fsck prefixes the error/warning +with the message ID, e.g. "missingEmail: invalid author/committer line +- missing email" means that setting `fsck.missingEmail = ignore` will +hide that issue. ++ +In general, it is better to enumerate existing objects with problems +with `fsck.skipList`, instead of listing the kind of breakages these +problematic objects share to be ignored, as doing the latter will +allow new instances of the same breakages go unnoticed. ++ +Setting an unknown `fsck.` value will cause fsck to die, but +doing the same for `receive.fsck.` and `fetch.fsck.` +will only cause git to warn. + +fsck.skipList:: + The path to a list of object names (i.e. one unabbreviated SHA-1 per + line) that are known to be broken in a non-fatal way and should + be ignored. On versions of Git 2.20 and later comments ('#'), empty + lines, and any leading and trailing whitespace is ignored. Everything + but a SHA-1 per line will error out on older versions. ++ +This feature is useful when an established project should be accepted +despite early commits containing errors that can be safely ignored +such as invalid committer email addresses. Note: corrupt objects +cannot be skipped with this setting. ++ +Like `fsck.` this variable has corresponding +`receive.fsck.skipList` and `fetch.fsck.skipList` variants. ++ +Unlike variables like `color.ui` and `core.editor` the +`receive.fsck.skipList` and `fetch.fsck.skipList` variables will not +fall back on the `fsck.skipList` configuration if they aren't set. To +uniformly configure the same fsck settings in different circumstances +all three of them they must all set to the same values. ++ +Older versions of Git (before 2.20) documented that the object names +list should be sorted. This was never a requirement, the object names +could appear in any order, but when reading the list we tracked whether +the list was sorted for the purposes of an internal binary search +implementation, which could save itself some work with an already sorted +list. Unless you had a humongous list there was no reason to go out of +your way to pre-sort the list. After Git version 2.20 a hash implementation +is used instead, so there's now no reason to pre-sort the list. From patchwork Sat Oct 20 12:38:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650441 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 C5B5990 for ; Sat, 20 Oct 2018 12:39:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AE5DE2861D for ; Sat, 20 Oct 2018 12:39:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A1E5328620; Sat, 20 Oct 2018 12:39:28 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 D4A922861E for ; Sat, 20 Oct 2018 12:39:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727587AbeJTUtq (ORCPT ); Sat, 20 Oct 2018 16:49:46 -0400 Received: from mail-lf1-f66.google.com ([209.85.167.66]:41874 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727531AbeJTUtp (ORCPT ); Sat, 20 Oct 2018 16:49:45 -0400 Received: by mail-lf1-f66.google.com with SMTP id q39-v6so27120344lfi.8 for ; Sat, 20 Oct 2018 05:39:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kzVS5EDkoC3bFTJuUe/Qj1XinCWgRoNvw69x+NqPmgk=; b=K2aN1Wq6o+SGatirdPEALFwvgSY/4QC4CpacQKxIBVeZU9W57Gn+o529qTRIu2TD/I EdL9/52iLfVV7FoeVRvRJ7MeouKyAkTgdoSn90gDUlFSb9+Wbo0GNMqATITqQFLOeWjb JAUzPEp9JJQ3+uMncJQW+wpBDUQ6KOx4ul3cLKJqUCagrSXEuep/ASMSvwM+eVF3HcSM GEZPWGPZWGCB+3v/LnPcEqCBzBnexlE0PpVn86W7hVdqt1NYQjtUOFAdpQQ56hAewpk9 88vvoc7uVHaLGmqYMP3npzDrnfXnEIAfwZqoFkdkLNR3e3G8HFkCd01Ppa0kyqUfwj46 X4Fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kzVS5EDkoC3bFTJuUe/Qj1XinCWgRoNvw69x+NqPmgk=; b=NyHAgsjOl2jr1D0YLqwIL9VwB2EY5q3Bx7C7WN7kc5zoDOcj2yq3yAZyCIgOGKr1Tp b+bYMBjGQPKXceSmkQMlXTk8MCpHVkzJIZz9M3KkfjGd6+ejKkSTLSRVSu59MIdqU/1Q p1eJcLsWBgIXEHiwnyqb7Lmyr/WYF0tvwSKpjHsk308044ANLhxggXLXp+gtCACRn6Y7 uwtfAWaASSpNms+p6NtUWtKwvdRzRLkoI2lC4Csrj67khue5FHcQtgu8mmUpRAo/sWO4 ga1ElD1uk3FjLyfNWckzF3kfURNmlv8g0BSN8MOFb258r9IbbDVK22AlMKqa+UUsny/7 xhoA== X-Gm-Message-State: ABuFfoiO2zwQ+7406af8Q6Ka0vg3N550TJeDAUXjhMqlihmtQYr4cDvx yAxPxbnuNzsEBMfMgGOc2KPvQz4S X-Google-Smtp-Source: ACcGV63ufr+WcAulkqqRQUW3YFOnqxfaWAYYVBN84T8kLUYsxx1cfBf4ONGf271ds33s0430147rWA== X-Received: by 2002:a19:aa8b:: with SMTP id t133-v6mr5325890lfe.92.1540039162473; Sat, 20 Oct 2018 05:39:22 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:21 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 21/59] config.txt: move gc.* to a separate file Date: Sat, 20 Oct 2018 14:38:10 +0200 Message-Id: <20181020123848.2785-22-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 109 +----------------------------------- Documentation/gc-config.txt | 108 +++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 108 deletions(-) create mode 100644 Documentation/gc-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index fa26cb1090..ebef3c867a 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -333,114 +333,7 @@ include::filter-config.txt[] include::fsck-config.txt[] -gc.aggressiveDepth:: - The depth parameter used in the delta compression - algorithm used by 'git gc --aggressive'. This defaults - to 50. - -gc.aggressiveWindow:: - The window size parameter used in the delta compression - algorithm used by 'git gc --aggressive'. This defaults - to 250. - -gc.auto:: - When there are approximately more than this many loose - objects in the repository, `git gc --auto` will pack them. - Some Porcelain commands use this command to perform a - light-weight garbage collection from time to time. The - default value is 6700. Setting this to 0 disables it. - -gc.autoPackLimit:: - When there are more than this many packs that are not - marked with `*.keep` file in the repository, `git gc - --auto` consolidates them into one larger pack. The - default value is 50. Setting this to 0 disables it. - -gc.autoDetach:: - Make `git gc --auto` return immediately and run in background - if the system supports it. Default is true. - -gc.bigPackThreshold:: - If non-zero, all packs larger than this limit are kept when - `git gc` is run. This is very similar to `--keep-base-pack` - except that all packs that meet the threshold are kept, not - just the base pack. Defaults to zero. Common unit suffixes of - 'k', 'm', or 'g' are supported. -+ -Note that if the number of kept packs is more than gc.autoPackLimit, -this configuration variable is ignored, all packs except the base pack -will be repacked. After this the number of packs should go below -gc.autoPackLimit and gc.bigPackThreshold should be respected again. - -gc.writeCommitGraph:: - If true, then gc will rewrite the commit-graph file when - linkgit:git-gc[1] is run. When using linkgit:git-gc[1] - '--auto' the commit-graph will be updated if housekeeping is - required. Default is false. See linkgit:git-commit-graph[1] - for details. - -gc.logExpiry:: - If the file gc.log exists, then `git gc --auto` will print - its content and exit with status zero instead of running - unless that file is more than 'gc.logExpiry' old. Default is - "1.day". See `gc.pruneExpire` for more ways to specify its - value. - -gc.packRefs:: - Running `git pack-refs` in a repository renders it - unclonable by Git versions prior to 1.5.1.2 over dumb - transports such as HTTP. This variable determines whether - 'git gc' runs `git pack-refs`. This can be set to `notbare` - to enable it within all non-bare repos or it can be set to a - boolean value. The default is `true`. - -gc.pruneExpire:: - When 'git gc' is run, it will call 'prune --expire 2.weeks.ago'. - Override the grace period with this config variable. The value - "now" may be used to disable this grace period and always prune - unreachable objects immediately, or "never" may be used to - suppress pruning. This feature helps prevent corruption when - 'git gc' runs concurrently with another process writing to the - repository; see the "NOTES" section of linkgit:git-gc[1]. - -gc.worktreePruneExpire:: - When 'git gc' is run, it calls - 'git worktree prune --expire 3.months.ago'. - This config variable can be used to set a different grace - period. The value "now" may be used to disable the grace - period and prune `$GIT_DIR/worktrees` immediately, or "never" - may be used to suppress pruning. - -gc.reflogExpire:: -gc..reflogExpire:: - 'git reflog expire' removes reflog entries older than - this time; defaults to 90 days. The value "now" expires all - entries immediately, and "never" suppresses expiration - altogether. With "" (e.g. - "refs/stash") in the middle the setting applies only to - the refs that match the . - -gc.reflogExpireUnreachable:: -gc..reflogExpireUnreachable:: - 'git reflog expire' removes reflog entries older than - this time and are not reachable from the current tip; - defaults to 30 days. The value "now" expires all entries - immediately, and "never" suppresses expiration altogether. - With "" (e.g. "refs/stash") - in the middle, the setting applies only to the refs that - match the . - -gc.rerereResolved:: - Records of conflicted merge you resolved earlier are - kept for this many days when 'git rerere gc' is run. - You can also use more human-readable "1.month.ago", etc. - The default is 60 days. See linkgit:git-rerere[1]. - -gc.rerereUnresolved:: - Records of conflicted merge you have not resolved are - kept for this many days when 'git rerere gc' is run. - You can also use more human-readable "1.month.ago", etc. - The default is 15 days. See linkgit:git-rerere[1]. +include::gc-config.txt[] include::gitcvs-config.txt[] diff --git a/Documentation/gc-config.txt b/Documentation/gc-config.txt new file mode 100644 index 0000000000..c6fbb8a96f --- /dev/null +++ b/Documentation/gc-config.txt @@ -0,0 +1,108 @@ +gc.aggressiveDepth:: + The depth parameter used in the delta compression + algorithm used by 'git gc --aggressive'. This defaults + to 50. + +gc.aggressiveWindow:: + The window size parameter used in the delta compression + algorithm used by 'git gc --aggressive'. This defaults + to 250. + +gc.auto:: + When there are approximately more than this many loose + objects in the repository, `git gc --auto` will pack them. + Some Porcelain commands use this command to perform a + light-weight garbage collection from time to time. The + default value is 6700. Setting this to 0 disables it. + +gc.autoPackLimit:: + When there are more than this many packs that are not + marked with `*.keep` file in the repository, `git gc + --auto` consolidates them into one larger pack. The + default value is 50. Setting this to 0 disables it. + +gc.autoDetach:: + Make `git gc --auto` return immediately and run in background + if the system supports it. Default is true. + +gc.bigPackThreshold:: + If non-zero, all packs larger than this limit are kept when + `git gc` is run. This is very similar to `--keep-base-pack` + except that all packs that meet the threshold are kept, not + just the base pack. Defaults to zero. Common unit suffixes of + 'k', 'm', or 'g' are supported. ++ +Note that if the number of kept packs is more than gc.autoPackLimit, +this configuration variable is ignored, all packs except the base pack +will be repacked. After this the number of packs should go below +gc.autoPackLimit and gc.bigPackThreshold should be respected again. + +gc.writeCommitGraph:: + If true, then gc will rewrite the commit-graph file when + linkgit:git-gc[1] is run. When using linkgit:git-gc[1] + '--auto' the commit-graph will be updated if housekeeping is + required. Default is false. See linkgit:git-commit-graph[1] + for details. + +gc.logExpiry:: + If the file gc.log exists, then `git gc --auto` will print + its content and exit with status zero instead of running + unless that file is more than 'gc.logExpiry' old. Default is + "1.day". See `gc.pruneExpire` for more ways to specify its + value. + +gc.packRefs:: + Running `git pack-refs` in a repository renders it + unclonable by Git versions prior to 1.5.1.2 over dumb + transports such as HTTP. This variable determines whether + 'git gc' runs `git pack-refs`. This can be set to `notbare` + to enable it within all non-bare repos or it can be set to a + boolean value. The default is `true`. + +gc.pruneExpire:: + When 'git gc' is run, it will call 'prune --expire 2.weeks.ago'. + Override the grace period with this config variable. The value + "now" may be used to disable this grace period and always prune + unreachable objects immediately, or "never" may be used to + suppress pruning. This feature helps prevent corruption when + 'git gc' runs concurrently with another process writing to the + repository; see the "NOTES" section of linkgit:git-gc[1]. + +gc.worktreePruneExpire:: + When 'git gc' is run, it calls + 'git worktree prune --expire 3.months.ago'. + This config variable can be used to set a different grace + period. The value "now" may be used to disable the grace + period and prune `$GIT_DIR/worktrees` immediately, or "never" + may be used to suppress pruning. + +gc.reflogExpire:: +gc..reflogExpire:: + 'git reflog expire' removes reflog entries older than + this time; defaults to 90 days. The value "now" expires all + entries immediately, and "never" suppresses expiration + altogether. With "" (e.g. + "refs/stash") in the middle the setting applies only to + the refs that match the . + +gc.reflogExpireUnreachable:: +gc..reflogExpireUnreachable:: + 'git reflog expire' removes reflog entries older than + this time and are not reachable from the current tip; + defaults to 30 days. The value "now" expires all entries + immediately, and "never" suppresses expiration altogether. + With "" (e.g. "refs/stash") + in the middle, the setting applies only to the refs that + match the . + +gc.rerereResolved:: + Records of conflicted merge you resolved earlier are + kept for this many days when 'git rerere gc' is run. + You can also use more human-readable "1.month.ago", etc. + The default is 60 days. See linkgit:git-rerere[1]. + +gc.rerereUnresolved:: + Records of conflicted merge you have not resolved are + kept for this many days when 'git rerere gc' is run. + You can also use more human-readable "1.month.ago", etc. + The default is 15 days. See linkgit:git-rerere[1]. From patchwork Sat Oct 20 12:38:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650443 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 7490317D4 for ; Sat, 20 Oct 2018 12:39:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5D7822861D for ; Sat, 20 Oct 2018 12:39:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4FECC28620; Sat, 20 Oct 2018 12:39:29 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 E8F402861D for ; Sat, 20 Oct 2018 12:39:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727584AbeJTUtq (ORCPT ); Sat, 20 Oct 2018 16:49:46 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:37870 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727582AbeJTUtq (ORCPT ); Sat, 20 Oct 2018 16:49:46 -0400 Received: by mail-lj1-f195.google.com with SMTP id 63-v6so33122042ljs.4 for ; Sat, 20 Oct 2018 05:39:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1ZjnXr0QrGlwOcbqQy9O96Rrb9/u4acirWtkEB9+97c=; b=ira4ykyyQY1Ic41raEZQ2C2juwGgsutjHMZjDhG9c502htvrtLN88P12ebWguEFOxV B2qiw6y0RRu2YsBD/5f2lkBYaQnZUt4YWbPGx0dChAYX+DrrvG+ErRkwmm/6Q3igbGeg 0WSX2TStFelcxKc5Vx8OnVWEcGghbaveGNC4z5BfwqgAotDf6o1ckWDbag1Y7s0Uwkif YtzVxAX8NQg8cX0++pDmm2sRrU8fe/274/Y/KiTJV4vrGflIM0W16oFtqiWB0QxKs7ax mtYcKgymdpETDpTy/DYOO/16+xHOGCnKKhUAMIG96/yw1sJTf9yo8l4lVMUJjAcJ36BL aIVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1ZjnXr0QrGlwOcbqQy9O96Rrb9/u4acirWtkEB9+97c=; b=LuYjWUl6qbtoW1LCauYXVk4HUMeBBF5OIIK7g16MgdhWk/6TTVhiGLkMqvCc9e/vyj s/IPCzjFbsnIv8mBg0v1bMb8IbpUYgAKtWeWiMSWrg8F1eni7htYznJs4h5YGUwD8nrj bXnIaP6jwvGWhztb07SqLF64uZaBHKPXCvXMy8dYyseIaqheLoh7HUt/Hn//dS27UPaw UXVrsCB7fbZVpDKmxYcnNzxv2y7d3z/VUrTZy9bFASAnnqM9dWdvOd/8AtMvQbjYtZye 4kFIVqqubtUzTgpxJ6FN7TMIFViqWphwlJNYhGjh5KpJppqulQ3OF8nNE841wyoHankt /jdw== X-Gm-Message-State: ABuFfoh8K/CwUd2nC7aHpYQh4N8LRzRPxPmpirXz//5aOJKYK61y8QGn vfkAOQ/Gjq1mmjthc4c7BgHyFgOS X-Google-Smtp-Source: AJdET5cWgKcgWMQkn443AoUYDXtAbuMT1CqAtCMcyPMyd8MnANfE63DixAg45Ul+WCvCxVhqHy2Whw== X-Received: by 2002:a2e:7217:: with SMTP id n23-v6mr3464054ljc.71.1540039163679; Sat, 20 Oct 2018 05:39:23 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:22 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 22/59] config.txt: move gitweb.* to a separate file Date: Sat, 20 Oct 2018 14:38:11 +0200 Message-Id: <20181020123848.2785-23-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 17 +---------------- Documentation/gitweb-config.txt | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 Documentation/gitweb-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index ebef3c867a..6898c9f567 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -337,22 +337,7 @@ include::gc-config.txt[] include::gitcvs-config.txt[] -gitweb.category:: -gitweb.description:: -gitweb.owner:: -gitweb.url:: - See linkgit:gitweb[1] for description. - -gitweb.avatar:: -gitweb.blame:: -gitweb.grep:: -gitweb.highlight:: -gitweb.patches:: -gitweb.pickaxe:: -gitweb.remote_heads:: -gitweb.showSizes:: -gitweb.snapshot:: - See linkgit:gitweb.conf[5] for description. +include::gitweb-config.txt[] grep.lineNumber:: If set to true, enable `-n` option by default. diff --git a/Documentation/gitweb-config.txt b/Documentation/gitweb-config.txt new file mode 100644 index 0000000000..1b51475108 --- /dev/null +++ b/Documentation/gitweb-config.txt @@ -0,0 +1,16 @@ +gitweb.category:: +gitweb.description:: +gitweb.owner:: +gitweb.url:: + See linkgit:gitweb[1] for description. + +gitweb.avatar:: +gitweb.blame:: +gitweb.grep:: +gitweb.highlight:: +gitweb.patches:: +gitweb.pickaxe:: +gitweb.remote_heads:: +gitweb.showSizes:: +gitweb.snapshot:: + See linkgit:gitweb.conf[5] for description. From patchwork Sat Oct 20 12:38:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650445 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 BB538112B for ; Sat, 20 Oct 2018 12:39:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A58DA2861D for ; Sat, 20 Oct 2018 12:39:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 99E2028620; Sat, 20 Oct 2018 12:39:30 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 2DDA92861D for ; Sat, 20 Oct 2018 12:39:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727593AbeJTUtt (ORCPT ); Sat, 20 Oct 2018 16:49:49 -0400 Received: from mail-lf1-f65.google.com ([209.85.167.65]:45148 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727531AbeJTUts (ORCPT ); Sat, 20 Oct 2018 16:49:48 -0400 Received: by mail-lf1-f65.google.com with SMTP id c24-v6so676800lfi.12 for ; Sat, 20 Oct 2018 05:39:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QCWKJ8Sk/UAJaxmd0XDTrMTYje1y+4CsrWry0fLXqJQ=; b=jtlyaVzFKSacg34COkHqlFXESS0oCDNHRB1KaimsNAIWsS82goW56QB2EIBrXohz95 2QsdE77jNFqNttLsujbbjHGCpoHA+u5CI0VZng4Yv3fSZ3mKPgzIE+A3oW5yy7kDAZC8 cS8TA//fW9j82G2Pr6FEQjVVuKjJIPgi0dY6ZnKlrNVKDgVDo006HBaRqDH1a2s9Q4DI 1fT7L2AE2c7gb11xwZhgF1XPoPkDRnEsGcws784f9vyd4HDYy3c5TLsNwZDWjHEUzHet 1IIa7B30VyYIKj6ELZ+hWZszXGL9i1lgK1dD24YN58h1fcn4bqVvUr10ZQtsrQZ5bl81 9mCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QCWKJ8Sk/UAJaxmd0XDTrMTYje1y+4CsrWry0fLXqJQ=; b=d1Ag6QqFjcSEuoQTL7Wdr3/3qahjmogVY8qKOjQq87w6Z2oQ9BRQaav9MnEPPrpOJK VY66uVZbTRCOXZqhtaBV5yhW9wa+4pwha0J+ubilOqlEFEoecuBwuRkdZilPHoCa5B6V SO+PXvNBHiK/B1UlUuwHgo4uVWdgXxijmghBvFutzxGw2TjuZgc/k5MbI/hTmKvr3ONK usnNVQ8KsonWBN1W+zW9xJvZRCaJp6rz4aPnp9zwLgn64IHD6iJ1vOiYZMthHjrH5M7K 6fPtEd3kQGnyHrDmydkEntFoAVJwN/VCRVA9DhECRxangNpPe0ryKGFgnJT3RLfuxCTE 0YTA== X-Gm-Message-State: ABuFfoj+YR5cF+0WDYEJy4f2nDdO4UMZSAG+tz/3LfBb0tIcktWWHnH5 pMo5n1nlJq8PCtseExMlUqRJHgwU X-Google-Smtp-Source: ACcGV61QuV7CbgtkX58JAbuNVQpvdTB8xKYNIOsd16l7aDaZQTKvl1m4LE9PXax4ScYBTNw2zWlcjA== X-Received: by 2002:a19:750e:: with SMTP id y14-v6mr1122715lfe.43.1540039166055; Sat, 20 Oct 2018 05:39:26 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:25 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 23/59] config.txt: move grep.* to a separate file Date: Sat, 20 Oct 2018 14:38:12 +0200 Message-Id: <20181020123848.2785-24-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 25 +------------------------ Documentation/grep-config.txt | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 24 deletions(-) create mode 100644 Documentation/grep-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 6898c9f567..3065520a7f 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -339,30 +339,7 @@ include::gitcvs-config.txt[] include::gitweb-config.txt[] -grep.lineNumber:: - If set to true, enable `-n` option by default. - -grep.column:: - If set to true, enable the `--column` option by default. - -grep.patternType:: - Set the default matching behavior. Using a value of 'basic', 'extended', - 'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`, - `--fixed-strings`, or `--perl-regexp` option accordingly, while the - value 'default' will return to the default matching behavior. - -grep.extendedRegexp:: - If set to true, enable `--extended-regexp` option by default. This - option is ignored when the `grep.patternType` option is set to a value - other than 'default'. - -grep.threads:: - Number of grep worker threads to use. - See `grep.threads` in linkgit:git-grep[1] for more information. - -grep.fallbackToNoIndex:: - If set to true, fall back to git grep --no-index if git grep - is executed outside of a git repository. Defaults to false. +include::grep-config.txt[] gpg.program:: Use this custom program instead of "`gpg`" found on `$PATH` when diff --git a/Documentation/grep-config.txt b/Documentation/grep-config.txt new file mode 100644 index 0000000000..44abe45a7c --- /dev/null +++ b/Documentation/grep-config.txt @@ -0,0 +1,24 @@ +grep.lineNumber:: + If set to true, enable `-n` option by default. + +grep.column:: + If set to true, enable the `--column` option by default. + +grep.patternType:: + Set the default matching behavior. Using a value of 'basic', 'extended', + 'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`, + `--fixed-strings`, or `--perl-regexp` option accordingly, while the + value 'default' will return to the default matching behavior. + +grep.extendedRegexp:: + If set to true, enable `--extended-regexp` option by default. This + option is ignored when the `grep.patternType` option is set to a value + other than 'default'. + +grep.threads:: + Number of grep worker threads to use. + See `grep.threads` in linkgit:git-grep[1] for more information. + +grep.fallbackToNoIndex:: + If set to true, fall back to git grep --no-index if git grep + is executed outside of a git repository. Defaults to false. From patchwork Sat Oct 20 12:38:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650447 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 9FC2290 for ; Sat, 20 Oct 2018 12:39:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 89F6A2861D for ; Sat, 20 Oct 2018 12:39:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7E60E28620; Sat, 20 Oct 2018 12:39:33 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 1FA902861D for ; Sat, 20 Oct 2018 12:39:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727600AbeJTUtw (ORCPT ); Sat, 20 Oct 2018 16:49:52 -0400 Received: from mail-lf1-f67.google.com ([209.85.167.67]:37276 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727531AbeJTUtv (ORCPT ); Sat, 20 Oct 2018 16:49:51 -0400 Received: by mail-lf1-f67.google.com with SMTP id a82-v6so27143254lfa.4 for ; Sat, 20 Oct 2018 05:39:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4rsQPD/DAphXqmh++OERe5hZ/OI5zPxkPVB59bwTOjM=; b=I/dAE+YBINrcGtc7tblb5D+Vlk/dTMODeWDEtu2LTGuCcH2qyLfwXJAagVR3Md11Mp vm+JQewXbzkLh2UQAkq0AvGP+LLD8qDzKnZ+dmGAsjogNZvs1b7i/QrBEyk0yUN9pGUM EMHBAk0rVX8CBQvsu+1NTO8w7sR7gXMOp9GNEUC5v7rBIII0w7axhgtY97CEAeczs4h8 r+Hu5sWWtx9ivFVe7mlDq5s0nsBsqDwnXW5q62icYgFs1MMDsT3m+tSijZ6ONRsbBo1M /TtYtQeiJn0HBPQ3uGcWU4cF6S9CCTErKRxOZPe5b5fJY8Jc4PeNfRGaI+NuGCtEDQWv EGzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4rsQPD/DAphXqmh++OERe5hZ/OI5zPxkPVB59bwTOjM=; b=GcE8CRUW/BSKW4UV23SI4EoJR+5ytT8ZqRPeikxNAX5mPAfz2KgrKNzBsvf1VUz2TY GOZaKXNfx+pkzF7TcbKEQJlrjzmVPSsubIlpfVrR4Kr0JZbITDtZrir73Tggmw4gNHuv UmkEfHv4RH0JRYmBcvVH791cm6pNuy3b3Dm+8zFdh9W58LbLZHcjieERfWwPQzbvVnM9 oF9BqDZyrhnw49ARbxPSaYFhQEKcvdGzjF5OpyFY7y3ffPQ63rOCScbvWnK+b6f2mkSg B56FJCfgLZbh8qyGJZoiIk3O2geg5ddBovS9f9VYcWrOxcxAQXo6Kzhh++UBf52FOAPh C1rA== X-Gm-Message-State: ABuFfoh46n/ic91ByatpDTiYLcWShJGM4Z8ZrtCw1EMXVHknlgYbsfNm ATqF8GnAHchA0KVESbartsD8XFpD X-Google-Smtp-Source: ACcGV61S/TDnPRMi/GhQ+6+nnGE69ZX4F4IlVcLtMMIjfd/KZSTafufeEBBi5kEIaGEMqFtTbCUe7Q== X-Received: by 2002:a19:a686:: with SMTP id p128-v6mr5194363lfe.42.1540039169846; Sat, 20 Oct 2018 05:39:29 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:29 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 24/59] config.txt: move gpg.* to a separate file Date: Sat, 20 Oct 2018 14:38:13 +0200 Message-Id: <20181020123848.2785-25-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 21 +-------------------- Documentation/gpg-config.txt | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 20 deletions(-) create mode 100644 Documentation/gpg-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 3065520a7f..adab71fd94 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -341,26 +341,7 @@ include::gitweb-config.txt[] include::grep-config.txt[] -gpg.program:: - Use this custom program instead of "`gpg`" found on `$PATH` when - making or verifying a PGP signature. The program must support the - same command-line interface as GPG, namely, to verify a detached - signature, "`gpg --verify $file - <$signature`" is run, and the - program is expected to signal a good signature by exiting with - code 0, and to generate an ASCII-armored detached signature, the - standard input of "`gpg -bsau $key`" is fed with the contents to be - signed, and the program is expected to send the result to its - standard output. - -gpg.format:: - Specifies which key format to use when signing with `--gpg-sign`. - Default is "openpgp" and another possible value is "x509". - -gpg..program:: - Use this to customize the program used for the signing format you - chose. (see `gpg.program` and `gpg.format`) `gpg.program` can still - be used as a legacy synonym for `gpg.openpgp.program`. The default - value for `gpg.x509.program` is "gpgsm". +include::gpg-config.txt[] include::gui-config.txt[] diff --git a/Documentation/gpg-config.txt b/Documentation/gpg-config.txt new file mode 100644 index 0000000000..590fe0d4ba --- /dev/null +++ b/Documentation/gpg-config.txt @@ -0,0 +1,20 @@ +gpg.program:: + Use this custom program instead of "`gpg`" found on `$PATH` when + making or verifying a PGP signature. The program must support the + same command-line interface as GPG, namely, to verify a detached + signature, "`gpg --verify $file - <$signature`" is run, and the + program is expected to signal a good signature by exiting with + code 0, and to generate an ASCII-armored detached signature, the + standard input of "`gpg -bsau $key`" is fed with the contents to be + signed, and the program is expected to send the result to its + standard output. + +gpg.format:: + Specifies which key format to use when signing with `--gpg-sign`. + Default is "openpgp" and another possible value is "x509". + +gpg..program:: + Use this to customize the program used for the signing format you + chose. (see `gpg.program` and `gpg.format`) `gpg.program` can still + be used as a legacy synonym for `gpg.openpgp.program`. The default + value for `gpg.x509.program` is "gpgsm". From patchwork Sat Oct 20 12:38:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650449 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 94E2D90 for ; Sat, 20 Oct 2018 12:39:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7EF512861D for ; Sat, 20 Oct 2018 12:39:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 733C428620; Sat, 20 Oct 2018 12:39:37 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 E96C52861D for ; Sat, 20 Oct 2018 12:39:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727608AbeJTUtz (ORCPT ); Sat, 20 Oct 2018 16:49:55 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:44811 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727531AbeJTUtz (ORCPT ); Sat, 20 Oct 2018 16:49:55 -0400 Received: by mail-lj1-f196.google.com with SMTP id v6-v6so33058521ljc.11 for ; Sat, 20 Oct 2018 05:39:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FTjYxrSwO8jrgynBbPNG5rPb56mQrgQjDDUAm8MIGIg=; b=ecFY/HpQRGOtB/BPwoet1EsocAG3osM1Vht3QlvrpYrjg7pT04SGAfTztkAolQjEXR sn3ou1Cr1r//mWQDUXx4Jhhp0fn3AgFsv1H7Mu8KS9CjfyR9e5cy2/VpmUkpTtmWX7k6 Js/Gts+rbYNa9WbE8+WqIfIJ0ApktIq6laWRUa8wksnx/43Pl1YbH2lkzov7pd5k665C rOpA7gyxPCjCvVN4/NphU2OaqpC+1j4aNHsb3Qxi4wCQUnvVjxQs3csO1pllNTtYrm51 JxiG+lvn3aiKmzxjyAVwEMCsewPse6y6TdIXdNz+w13PPOet4/F6c9rYwFqUTukLev3l nJCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FTjYxrSwO8jrgynBbPNG5rPb56mQrgQjDDUAm8MIGIg=; b=t44cR+C3QQJ2B9dtcWx7EjRZ8Qz30Tx5BJLHctljto5RU+WrxVC2+zWNyuqttrIzQd x2B3uO+A7O6+oiP/hz81+Qbo3lq+rgBkWMA0ieB4h38+riCzUpm/Ou5NqcxX0IZ1e/on Erc5eqxW+FFeD6dKpslNs5yaYtRUna1MYr5X3pAMsQcDo9etWswPl1oJHuzw6uR376sa 0L6X94RRuQ8q7pevG7zm5B2nXdk9/m+Hzx5tOsEjiPwbSUc7dfJCepg/ihKcTlxoH/sp z29cc/slZvHeu9s+3NIWTNp6Gm1FP42SWjZg4E/Sps50laPsdfRXShJcn774ygHLcRWy DE5w== X-Gm-Message-State: ABuFfoiGa2eIvLoXYVcJMY3825RBJW+leFT0A3yXwIUPmiYMZrOHF59B 2xN1xQ7oLTQ+wWIxBHiWJb5sPjDc X-Google-Smtp-Source: ACcGV63Uk7skrjO8baucGkf/kiax9yzm9J6dopN7474nQj6dbH3Hp3bwlRNyktHUN7ngCfk4q1cOfw== X-Received: by 2002:a2e:5215:: with SMTP id g21-v6mr25001371ljb.144.1540039172348; Sat, 20 Oct 2018 05:39:32 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:31 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 25/59] config.txt: move guitool.* to a separate file Date: Sat, 20 Oct 2018 14:38:14 +0200 Message-Id: <20181020123848.2785-26-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 51 +------------------------------- Documentation/guitool-config.txt | 50 +++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 50 deletions(-) create mode 100644 Documentation/guitool-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index adab71fd94..93ec85ab6e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -345,56 +345,7 @@ include::gpg-config.txt[] include::gui-config.txt[] -guitool..cmd:: - Specifies the shell command line to execute when the corresponding item - of the linkgit:git-gui[1] `Tools` menu is invoked. This option is - mandatory for every tool. The command is executed from the root of - the working directory, and in the environment it receives the name of - the tool as `GIT_GUITOOL`, the name of the currently selected file as - 'FILENAME', and the name of the current branch as 'CUR_BRANCH' (if - the head is detached, 'CUR_BRANCH' is empty). - -guitool..needsFile:: - Run the tool only if a diff is selected in the GUI. It guarantees - that 'FILENAME' is not empty. - -guitool..noConsole:: - Run the command silently, without creating a window to display its - output. - -guitool..noRescan:: - Don't rescan the working directory for changes after the tool - finishes execution. - -guitool..confirm:: - Show a confirmation dialog before actually running the tool. - -guitool..argPrompt:: - Request a string argument from the user, and pass it to the tool - through the `ARGS` environment variable. Since requesting an - argument implies confirmation, the 'confirm' option has no effect - if this is enabled. If the option is set to 'true', 'yes', or '1', - the dialog uses a built-in generic prompt; otherwise the exact - value of the variable is used. - -guitool..revPrompt:: - Request a single valid revision from the user, and set the - `REVISION` environment variable. In other aspects this option - is similar to 'argPrompt', and can be used together with it. - -guitool..revUnmerged:: - Show only unmerged branches in the 'revPrompt' subdialog. - This is useful for tools similar to merge or rebase, but not - for things like checkout or reset. - -guitool..title:: - Specifies the title to use for the prompt dialog. The default - is the tool name. - -guitool..prompt:: - Specifies the general prompt string to display at the top of - the dialog, before subsections for 'argPrompt' and 'revPrompt'. - The default value includes the actual command. +include::guitool-config.txt[] help.browser:: Specify the browser that will be used to display help in the diff --git a/Documentation/guitool-config.txt b/Documentation/guitool-config.txt new file mode 100644 index 0000000000..43fb9466ff --- /dev/null +++ b/Documentation/guitool-config.txt @@ -0,0 +1,50 @@ +guitool..cmd:: + Specifies the shell command line to execute when the corresponding item + of the linkgit:git-gui[1] `Tools` menu is invoked. This option is + mandatory for every tool. The command is executed from the root of + the working directory, and in the environment it receives the name of + the tool as `GIT_GUITOOL`, the name of the currently selected file as + 'FILENAME', and the name of the current branch as 'CUR_BRANCH' (if + the head is detached, 'CUR_BRANCH' is empty). + +guitool..needsFile:: + Run the tool only if a diff is selected in the GUI. It guarantees + that 'FILENAME' is not empty. + +guitool..noConsole:: + Run the command silently, without creating a window to display its + output. + +guitool..noRescan:: + Don't rescan the working directory for changes after the tool + finishes execution. + +guitool..confirm:: + Show a confirmation dialog before actually running the tool. + +guitool..argPrompt:: + Request a string argument from the user, and pass it to the tool + through the `ARGS` environment variable. Since requesting an + argument implies confirmation, the 'confirm' option has no effect + if this is enabled. If the option is set to 'true', 'yes', or '1', + the dialog uses a built-in generic prompt; otherwise the exact + value of the variable is used. + +guitool..revPrompt:: + Request a single valid revision from the user, and set the + `REVISION` environment variable. In other aspects this option + is similar to 'argPrompt', and can be used together with it. + +guitool..revUnmerged:: + Show only unmerged branches in the 'revPrompt' subdialog. + This is useful for tools similar to merge or rebase, but not + for things like checkout or reset. + +guitool..title:: + Specifies the title to use for the prompt dialog. The default + is the tool name. + +guitool..prompt:: + Specifies the general prompt string to display at the top of + the dialog, before subsections for 'argPrompt' and 'revPrompt'. + The default value includes the actual command. From patchwork Sat Oct 20 12:38:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650451 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 B1B3690 for ; Sat, 20 Oct 2018 12:39:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9C07D2861D for ; Sat, 20 Oct 2018 12:39:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 906BD28620; Sat, 20 Oct 2018 12:39:38 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 2F7C72861D for ; Sat, 20 Oct 2018 12:39:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727613AbeJTUt5 (ORCPT ); Sat, 20 Oct 2018 16:49:57 -0400 Received: from mail-lf1-f66.google.com ([209.85.167.66]:40463 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727602AbeJTUt4 (ORCPT ); Sat, 20 Oct 2018 16:49:56 -0400 Received: by mail-lf1-f66.google.com with SMTP id n3-v6so277337lfe.7 for ; Sat, 20 Oct 2018 05:39:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GO1QHN01H56hz9fSYQsF0Cbs+1gK4YWKnXuQJkoyZqQ=; b=SOgoiFtpoR9AKdas3aRRkkDZp1UDAD1X84tzUjVXviPMT3eRWeSNXFI/mPPcfzYWA+ SttcQxmxbDuYaRf9gkp6WPkpOFb1bNKW125EInGtNFYzh6f3WqyUfV45xhdnk4QvYkV9 7CrJpg2FQDGObe1jraV4MF7cqYs3bVgr6bbTkFIOxLzeZ3vvfUh3xWq6PRrEP+bthW+4 1Xid5h8tfQBBCwon1JNoEnzhC+lcfSScxbtyBYFIKMv7vsvr4hhdsElAjmSN1McCp5xV tx9i0F7RB1i1aFrp/hrFGlT+1SxJfoiC0ndlr5Xex1O6RyY2lnX8g+PibElUXyi5Bcr0 VLGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GO1QHN01H56hz9fSYQsF0Cbs+1gK4YWKnXuQJkoyZqQ=; b=f5wQrBSDWI1jzbP8+Ygb7By1wL2mKokSd1PjIv0zL1rcqNAj1U9FyQ1ZvkEj+ZalB7 NtaI0S3Gaviu64bffAPU9R9vDuY/7JSsHHsD/RbGbq27++qmHO0D7HogY99hXsRwmq+D XEWbgiNj2QCeWn8Gz5RfGj4yBosHk+jgqVGL1oP9+jIH2uPxl3CIxGlb7T6b2nsSu6KI wHMNBBFsgcXXqZNOJn2fz4xorwgEWDSU49mEUzpyzY5Og8eS/Stqw6CKTCwulWlwEdnY jX6c9HxWzjl+qgS3db0Q2TaLFLZ7RV8MspRD89+KC9Yjj8NRHS50TFdxw0ijs3B6h4Fv xHAw== X-Gm-Message-State: ABuFfohLj19dGqemxbjJQoB4l7HGQHIptSj7oC8VvXb6HAMOm/7jm1Pm Xyg8pKQynxlLMwx9+XGKyrg3OhSh X-Google-Smtp-Source: ACcGV63HLFQf7JGOu9fEZgUrj01THMNraS2XhVC5ZTYJZ4BucbzhUwV0VPc3R/CZsUJl/BXchf8eug== X-Received: by 2002:a19:2583:: with SMTP id l125-v6mr5496851lfl.73.1540039174130; Sat, 20 Oct 2018 05:39:34 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:33 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 26/59] config.txt: move help.* to a separate file Date: Sat, 20 Oct 2018 14:38:15 +0200 Message-Id: <20181020123848.2785-27-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 24 +----------------------- Documentation/help-config.txt | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 23 deletions(-) create mode 100644 Documentation/help-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 93ec85ab6e..bb49f4c894 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -347,29 +347,7 @@ include::gui-config.txt[] include::guitool-config.txt[] -help.browser:: - Specify the browser that will be used to display help in the - 'web' format. See linkgit:git-help[1]. - -help.format:: - Override the default help format used by linkgit:git-help[1]. - Values 'man', 'info', 'web' and 'html' are supported. 'man' is - the default. 'web' and 'html' are the same. - -help.autoCorrect:: - Automatically correct and execute mistyped commands after - waiting for the given number of deciseconds (0.1 sec). If more - than one command can be deduced from the entered text, nothing - will be executed. If the value of this option is negative, - the corrected command will be executed immediately. If the - value is 0 - the command will be just shown but not executed. - This is the default. - -help.htmlPath:: - Specify the path where the HTML documentation resides. File system paths - and URLs are supported. HTML pages will be prefixed with this path when - help is displayed in the 'web' format. This defaults to the documentation - path of your Git installation. +include::help-config.txt[] http.proxy:: Override the HTTP proxy, normally configured using the 'http_proxy', diff --git a/Documentation/help-config.txt b/Documentation/help-config.txt new file mode 100644 index 0000000000..224bbf5a28 --- /dev/null +++ b/Documentation/help-config.txt @@ -0,0 +1,23 @@ +help.browser:: + Specify the browser that will be used to display help in the + 'web' format. See linkgit:git-help[1]. + +help.format:: + Override the default help format used by linkgit:git-help[1]. + Values 'man', 'info', 'web' and 'html' are supported. 'man' is + the default. 'web' and 'html' are the same. + +help.autoCorrect:: + Automatically correct and execute mistyped commands after + waiting for the given number of deciseconds (0.1 sec). If more + than one command can be deduced from the entered text, nothing + will be executed. If the value of this option is negative, + the corrected command will be executed immediately. If the + value is 0 - the command will be just shown but not executed. + This is the default. + +help.htmlPath:: + Specify the path where the HTML documentation resides. File system paths + and URLs are supported. HTML pages will be prefixed with this path when + help is displayed in the 'web' format. This defaults to the documentation + path of your Git installation. From patchwork Sat Oct 20 12:38:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650453 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 A0D5790 for ; Sat, 20 Oct 2018 12:39:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8AF052861D for ; Sat, 20 Oct 2018 12:39:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7F0F128620; Sat, 20 Oct 2018 12:39:40 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 094A82861D for ; Sat, 20 Oct 2018 12:39:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727620AbeJTUt6 (ORCPT ); Sat, 20 Oct 2018 16:49:58 -0400 Received: from mail-lf1-f67.google.com ([209.85.167.67]:43186 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727531AbeJTUt6 (ORCPT ); Sat, 20 Oct 2018 16:49:58 -0400 Received: by mail-lf1-f67.google.com with SMTP id p34-v6so27137706lfg.10 for ; Sat, 20 Oct 2018 05:39:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vw81aJrr5FTRevLsv0B4Zzh/Y1XAWp2c/IQOPQiI5CU=; b=uDwLm2h6m+6gLqDvaNeIc4ny20OFktlWVSP/adX/3ntfcxJmGXe6v4DHd2fOcTRl+Z zGkuqjyiRnaAvZl0zewz6KIIlGZg+5508/tR1N3Fv7E9iEceS7cDdbMpFYXibkfJyEyk StLfpLNdEHG+LgdtjSyBXzOCyQbIkOBEIYKgtl7ssHusaRawBa3ZX/a4svEXXYCjOXbp lhU8mlI/fJL/oO2BSUWQ5bIlslqGwOUyYczfVRBAlvj6lMTd9pqU4hDWZI77WL0NAiDm 5n5K06hsN2zzRSTIN2SSFhxDGldtvsPQ9xOX86WeMUBuHOzIBs3U/bLCbRaqsCfY/Wwq lYlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vw81aJrr5FTRevLsv0B4Zzh/Y1XAWp2c/IQOPQiI5CU=; b=hWHvZQgVHl1wG+n98J/a4BCZOR7aPhfwHXt3K8cPGhCTrnDR/iBKGLwQub7C7vypoV ATrBjEin04TXcGLDVcmDIDF8JE6xqm7XH78mkq+fxCTPRgE0qVQugQTGjiPBXnvITDbL V+cgiD4fqCuWgjwCUZx0TaHjCAiV/Se78c8aFx1mF8IZYriw2W89sZwcVtcaMB2jvwYn bZ5E17wdxqwWqATijYr82yGiUc80hWyOQI8AlYooinncaM4uBRHyhtd7C0cfxFEmhRfC OhsalOgl4YEiuw1tt5BwDVii/VBGdQz3H8M+G52jIdVf1JmL67Co0wrsWGqylXMTPzQJ S1jg== X-Gm-Message-State: ABuFfoh3osr1SvDEEOUArwutnVI0VRcLmrIUq0nbaQhur9adDpRo6a3N lLlzgEzUyMjPz9iT72v0b4ElFBRp X-Google-Smtp-Source: ACcGV602Es/hubPYhBe07UG9yX311VXlZpp4lk+Pn68Yh22sMhyaOiNV1zWxMCOVAdcYAe78f3TNvg== X-Received: by 2002:a19:14c6:: with SMTP id 67mr594601lfu.7.1540039175511; Sat, 20 Oct 2018 05:39:35 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:34 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 27/59] config.txt: move ssh.* to a separate file Date: Sat, 20 Oct 2018 14:38:16 +0200 Message-Id: <20181020123848.2785-28-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 38 ++---------------------------------- Documentation/ssh-config.txt | 35 +++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 36 deletions(-) create mode 100644 Documentation/ssh-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index bb49f4c894..da97097805 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -600,42 +600,6 @@ Environment variable settings always override any matches. The URLs that are matched against are those given directly to Git commands. This means any URLs visited as a result of a redirection do not participate in matching. -ssh.variant:: - By default, Git determines the command line arguments to use - based on the basename of the configured SSH command (configured - using the environment variable `GIT_SSH` or `GIT_SSH_COMMAND` or - the config setting `core.sshCommand`). If the basename is - unrecognized, Git will attempt to detect support of OpenSSH - options by first invoking the configured SSH command with the - `-G` (print configuration) option and will subsequently use - OpenSSH options (if that is successful) or no options besides - the host and remote command (if it fails). -+ -The config variable `ssh.variant` can be set to override this detection. -Valid values are `ssh` (to use OpenSSH options), `plink`, `putty`, -`tortoiseplink`, `simple` (no options except the host and remote command). -The default auto-detection can be explicitly requested using the value -`auto`. Any other value is treated as `ssh`. This setting can also be -overridden via the environment variable `GIT_SSH_VARIANT`. -+ -The current command-line parameters used for each variant are as -follows: -+ --- - -* `ssh` - [-p port] [-4] [-6] [-o option] [username@]host command - -* `simple` - [username@]host command - -* `plink` or `putty` - [-P port] [-4] [-6] [username@]host command - -* `tortoiseplink` - [-P port] [-4] [-6] -batch [username@]host command - --- -+ -Except for the `simple` variant, command-line parameters are likely to -change as git gains new features. - i18n.commitEncoding:: Character encoding the commit messages are stored in; Git itself does not care per se, but this information is necessary e.g. when @@ -1274,6 +1238,8 @@ splitIndex.sharedIndexExpire:: either created based on it or read from it. See linkgit:git-update-index[1]. +include::ssh-config.txt[] + status.relativePaths:: By default, linkgit:git-status[1] shows paths relative to the current directory. Setting this variable to `false` shows paths diff --git a/Documentation/ssh-config.txt b/Documentation/ssh-config.txt new file mode 100644 index 0000000000..2ca4bf93e1 --- /dev/null +++ b/Documentation/ssh-config.txt @@ -0,0 +1,35 @@ +ssh.variant:: + By default, Git determines the command line arguments to use + based on the basename of the configured SSH command (configured + using the environment variable `GIT_SSH` or `GIT_SSH_COMMAND` or + the config setting `core.sshCommand`). If the basename is + unrecognized, Git will attempt to detect support of OpenSSH + options by first invoking the configured SSH command with the + `-G` (print configuration) option and will subsequently use + OpenSSH options (if that is successful) or no options besides + the host and remote command (if it fails). ++ +The config variable `ssh.variant` can be set to override this detection. +Valid values are `ssh` (to use OpenSSH options), `plink`, `putty`, +`tortoiseplink`, `simple` (no options except the host and remote command). +The default auto-detection can be explicitly requested using the value +`auto`. Any other value is treated as `ssh`. This setting can also be +overridden via the environment variable `GIT_SSH_VARIANT`. ++ +The current command-line parameters used for each variant are as +follows: ++ +-- + +* `ssh` - [-p port] [-4] [-6] [-o option] [username@]host command + +* `simple` - [username@]host command + +* `plink` or `putty` - [-P port] [-4] [-6] [username@]host command + +* `tortoiseplink` - [-P port] [-4] [-6] -batch [username@]host command + +-- ++ +Except for the `simple` variant, command-line parameters are likely to +change as git gains new features. From patchwork Sat Oct 20 12:38:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650455 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 21AC090 for ; Sat, 20 Oct 2018 12:39:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0B7882861D for ; Sat, 20 Oct 2018 12:39:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 000FE28620; Sat, 20 Oct 2018 12:39:41 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 9A7552861D for ; Sat, 20 Oct 2018 12:39:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727628AbeJTUuA (ORCPT ); Sat, 20 Oct 2018 16:50:00 -0400 Received: from mail-lj1-f194.google.com ([209.85.208.194]:44816 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727531AbeJTUuA (ORCPT ); Sat, 20 Oct 2018 16:50:00 -0400 Received: by mail-lj1-f194.google.com with SMTP id v6-v6so33058633ljc.11 for ; Sat, 20 Oct 2018 05:39:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QXrvDded2crQ+Tv+c2Sq/tF+MIm3KDjG0ehJj2ez5v8=; b=cxH5m3eBJrk3N0Aw+mXdDBJ2ksIiTlFI/6P9QrSsptlJTcCGhdio8yRf1y29OpvTmw cK0FnPABEm+k06p4L0HeC+DZvXaHqUoRrpbfnkdtC9AU8R0Al/r6Hpb6v14i4LxXUlsv o9UIqIUbkpbVRClnSQoh+v4kAnyrC4OTjlglgizNCY/fOQwNQ4wn3Z3MSFZftiGYxI0+ MpeTCyIWlkvqsH75CMXkV+WRMBKkbrGN1wTD+PU+intEaf25r5F3LaxCKleJkoDKY/sW NdshR7GnTYSsiP6x33FkcfTfZmbDruTz+zZWgg6XIvJh2ThbHHDK4zCptFdxBJmAgAd7 VPsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QXrvDded2crQ+Tv+c2Sq/tF+MIm3KDjG0ehJj2ez5v8=; b=nmEaa9QLAPK4rajZHWTw3dIRHllOIaCOHB+69DBCeo4saxbyA2YbwB03VMJ8T57zDW v9Sy9vkccFimCUTXgLzw73sfADGwdjw7N+ZQGql5eOhcWxDVywxwO6Ady1okhSadJskn gT1TtPJDzdMzebAlsMlG9pvqp9HyfYO4y3AoAluzuFZe8OVtAS0fY8CtWsXeNS1xMyZX +tIvNSWHRFhHWmlfIuu5VwJF6GU7cLM99ot6sytA5ep6pGkiLXThpmxpiB3tOBdpS0VG uVcDD/8s0xP4kGNaO11mDcI2as0ttzC+w0Zgi1MEVfO30iJ1nwA7RdwL+DKkzTihOte0 jdsw== X-Gm-Message-State: ABuFfoifRAKz/M6Ka4FkszsHAop9hQNkXK5NEwQrzMkG/9mL/UY9CKPd o6YeMsPoPAZbfNSK7ZD8AwTlp4FV X-Google-Smtp-Source: ACcGV60MzIhJXEEtEbZ5DLdRcqtKiu7LG8RpZFdaSVZJvtBaKvwB0Vb5h6Di0ReuWI3Kv8sf+hkbVw== X-Received: by 2002:a2e:9615:: with SMTP id v21-v6mr25031200ljh.150.1540039178255; Sat, 20 Oct 2018 05:39:38 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:37 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 28/59] config.txt: move i18n.* to a separate file Date: Sat, 20 Oct 2018 14:38:17 +0200 Message-Id: <20181020123848.2785-29-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 11 +---------- Documentation/i18n-config.txt | 10 ++++++++++ 2 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 Documentation/i18n-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index da97097805..ec0f4e2161 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -600,16 +600,7 @@ Environment variable settings always override any matches. The URLs that are matched against are those given directly to Git commands. This means any URLs visited as a result of a redirection do not participate in matching. -i18n.commitEncoding:: - Character encoding the commit messages are stored in; Git itself - does not care per se, but this information is necessary e.g. when - importing commits from emails or in the gitk graphical history - browser (and possibly at other places in the future or in other - porcelains). See e.g. linkgit:git-mailinfo[1]. Defaults to 'utf-8'. - -i18n.logOutputEncoding:: - Character encoding the commit messages are converted to when - running 'git log' and friends. +include::i18n-config.txt[] imap:: The configuration variables in the 'imap' section are described diff --git a/Documentation/i18n-config.txt b/Documentation/i18n-config.txt new file mode 100644 index 0000000000..cc25621731 --- /dev/null +++ b/Documentation/i18n-config.txt @@ -0,0 +1,10 @@ +i18n.commitEncoding:: + Character encoding the commit messages are stored in; Git itself + does not care per se, but this information is necessary e.g. when + importing commits from emails or in the gitk graphical history + browser (and possibly at other places in the future or in other + porcelains). See e.g. linkgit:git-mailinfo[1]. Defaults to 'utf-8'. + +i18n.logOutputEncoding:: + Character encoding the commit messages are converted to when + running 'git log' and friends. From patchwork Sat Oct 20 12:38:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650457 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 0DD32112B for ; Sat, 20 Oct 2018 12:39:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EC13D2861D for ; Sat, 20 Oct 2018 12:39:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E0ACA28620; Sat, 20 Oct 2018 12:39:44 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 890992861D for ; Sat, 20 Oct 2018 12:39:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727635AbeJTUuD (ORCPT ); Sat, 20 Oct 2018 16:50:03 -0400 Received: from mail-lj1-f194.google.com ([209.85.208.194]:36444 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727531AbeJTUuD (ORCPT ); Sat, 20 Oct 2018 16:50:03 -0400 Received: by mail-lj1-f194.google.com with SMTP id p89-v6so33111189ljb.3 for ; Sat, 20 Oct 2018 05:39:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=S+4e5DECkUG58Ssvw8baeB25w5BbI/toXaFYi2MrpAI=; b=lTiP480Jhyxu9R3cRn5mEhAncpCkkRvkTw/L+JuvTtZHHwxybXUeCgoY/elnDIqzOA Nyyn5RiBo+4+Dg331ICRlie4xZwKK8wAnZEVGs2m6nfKkt//UGTLElaKZpCkDIYBa+RW /oIMo+dY3G+xTwsyJKm3HSvdcvnWZyHkw9S4GGe7EPJN5wqQKMJUAu8cPIbke9skDgGl 8it7GwOYCJZbacCydriC7a/XNPPjs5C7xp1Wz1Rq961GC2df4J/V8/Y91a2gawtDH7rD 84eJ4EC9UzJlcTWGv6BwRZc9scHrfs61TXaNaIN6rf59GDEtNAW9vokklWyFDEdRZJwt 9sig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=S+4e5DECkUG58Ssvw8baeB25w5BbI/toXaFYi2MrpAI=; b=IUVOm2f1rWGdBW68E9xVhfEPWl3jJA472jOpu+3ZfeLah6cfsn3qdEUvTYjzw+/SAr Bu0S3pDS2VDE0A/hGvR+Mb7mAhBUveLOg4w8XbftuE81z80uurszmmJoUXaVGKmUtq+L z0sXUqeGJWpA+PoqxdLmodavzYHxs9KshEgkq5HbVLDpMVC77WegP3WRPX36reSweWfS +zmykm8wM3izOvRim/RPUzkVmIkDlS5v/HcKzLiqcSPKuN4mtTdmVD/Jwzp/tfl/1xcq uj3FjidK9meh2wZngJRXi5UpvkT749T1JjlyL/2M1Mr2KpR34TR25PrMlOXFQOfbl60l jWkQ== X-Gm-Message-State: ABuFfojQrFQ++q7YuvCU9a5SLJvaDsF2oDh3ah1+uqbGfpF6Ozfj7uzI Ctl2cNOUrnaOuebMpCQwyA9XYNr4 X-Google-Smtp-Source: ACcGV63kqhwi8/9rFKu0gatZ3q0j5ihZhTgv3z8oziGjSaBLXAKTVADOVQuu/BVMyb8b26jlktWo+w== X-Received: by 2002:a2e:9851:: with SMTP id e17-v6mr22401083ljj.143.1540039181075; Sat, 20 Oct 2018 05:39:41 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:40 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 29/59] config.txt: move i18n.* to a separate file Date: Sat, 20 Oct 2018 14:38:18 +0200 Message-Id: <20181020123848.2785-30-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 11 +---------- Documentation/index-config.txt | 10 ++++++++++ 2 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 Documentation/index-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index ec0f4e2161..5ba7975837 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -606,16 +606,7 @@ imap:: The configuration variables in the 'imap' section are described in linkgit:git-imap-send[1]. -index.threads:: - Specifies the number of threads to spawn when loading the index. - This is meant to reduce index load time on multiprocessor machines. - Specifying 0 or 'true' will cause Git to auto-detect the number of - CPU's and set the number of threads accordingly. Specifying 1 or - 'false' will disable multithreading. Defaults to 'true'. - -index.version:: - Specify the version with which new index files should be - initialized. This does not affect existing repositories. +include::index-config.txt[] init.templateDir:: Specify the directory from which templates will be copied. diff --git a/Documentation/index-config.txt b/Documentation/index-config.txt new file mode 100644 index 0000000000..4b94b6bedc --- /dev/null +++ b/Documentation/index-config.txt @@ -0,0 +1,10 @@ +index.threads:: + Specifies the number of threads to spawn when loading the index. + This is meant to reduce index load time on multiprocessor machines. + Specifying 0 or 'true' will cause Git to auto-detect the number of + CPU's and set the number of threads accordingly. Specifying 1 or + 'false' will disable multithreading. Defaults to 'true'. + +index.version:: + Specify the version with which new index files should be + initialized. This does not affect existing repositories. From patchwork Sat Oct 20 12:38:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650459 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 3065014E2 for ; Sat, 20 Oct 2018 12:39:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 192DE2861D for ; Sat, 20 Oct 2018 12:39:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0CAC128620; Sat, 20 Oct 2018 12:39:48 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 B004D2861D for ; Sat, 20 Oct 2018 12:39:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727641AbeJTUuG (ORCPT ); Sat, 20 Oct 2018 16:50:06 -0400 Received: from mail-lj1-f194.google.com ([209.85.208.194]:40863 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727631AbeJTUuE (ORCPT ); Sat, 20 Oct 2018 16:50:04 -0400 Received: by mail-lj1-f194.google.com with SMTP id r83-v6so33087031ljr.7 for ; Sat, 20 Oct 2018 05:39:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=o63APg7EZKXH+AvNp27WhscBQoDdXKSOyP3CVKuPLs8=; b=CzAgdk416QNPzNca+O43fKoDKnxALEU6r8x76WDA0E4cDGXm2DUVNhMFBVqn8ZpEiz XCzllWhvp2vg5VM3o9dLGQL69Y+x8IBezFixhoCOhtxet6IwyXMyuLcsbU3pT5JiVipE b0f8pdzdXiuo8gmThTISmvZ2tp0J+vjHphZuHMg7eYG7jpvYysz5hKcZmyAYUPziStOi JeZvxbumeUEbv2mJoqQeep/AQ3cwiQDMJD8sdUwOxOwsY8DRNpG2yGabJlxzFlvnjI/j 4Jc2G/LbEYs2XLPeIGabfJkzTBgrKYNBpRS7uazYaMFZvtxNmLKphmf5NKtFVeGZLT3u 60bA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=o63APg7EZKXH+AvNp27WhscBQoDdXKSOyP3CVKuPLs8=; b=O5Pa7gUqU1UeCzoXeBd4ichBysd6efDP0sjvaWuUHgd6/dmJuEDn+AC2doHHo8oKbd hCtddki3U53XOv4HE1WnUggzpY6Wz+qSljozeWvdxHm+H9DghMD2fa/5y3XIJ7dopFD4 IVtslXgIpkGLpFhEzi2wnYv80Tp3D6K9/gv+AoGqbeAf0wlMl8s4GzobROSSZLpR4wxJ +yJXVg0dxxLPiZ3OUJetcCmbWg1YxcAQqF23y9wQ+1P+0sHgdJ0bY1MO93gJiWwfT/Pg pJeolROVEtwveoFUNMXTTvKOty04fqUQFhxS6tzdgaXPXHZGKivMBVKfyOUyRH4wjMZw XrcQ== X-Gm-Message-State: ABuFfog27lMphs8XtWbbwRLl48By+n7zA5PEMNAcRdnZlvLawCTTthSp J+ysAGnBjt+49PmIiLab4LYeXpbf X-Google-Smtp-Source: ACcGV62pI1GN/IiVUkE4t4E8lR60EQgpGwfd1q8kpjCB8gSY6d+p9EnUv4WFYIkbtJTChlZqWTGN9A== X-Received: by 2002:a2e:8184:: with SMTP id e4-v6mr22460677ljg.138.1540039182316; Sat, 20 Oct 2018 05:39:42 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:41 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 30/59] config.txt: move init.* to a separate file Date: Sat, 20 Oct 2018 14:38:19 +0200 Message-Id: <20181020123848.2785-31-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 4 +--- Documentation/init-config.txt | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 Documentation/init-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 5ba7975837..c91dc2ceef 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -608,9 +608,7 @@ imap:: include::index-config.txt[] -init.templateDir:: - Specify the directory from which templates will be copied. - (See the "TEMPLATE DIRECTORY" section of linkgit:git-init[1].) +include::init-config.txt[] instaweb.browser:: Specify the program that will be used to browse your working diff --git a/Documentation/init-config.txt b/Documentation/init-config.txt new file mode 100644 index 0000000000..46fa8c6a08 --- /dev/null +++ b/Documentation/init-config.txt @@ -0,0 +1,3 @@ +init.templateDir:: + Specify the directory from which templates will be copied. + (See the "TEMPLATE DIRECTORY" section of linkgit:git-init[1].) From patchwork Sat Oct 20 12:38:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650461 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 C08C890 for ; Sat, 20 Oct 2018 12:39:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AAA9B2861D for ; Sat, 20 Oct 2018 12:39:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9EF4428620; Sat, 20 Oct 2018 12:39:48 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 422992861D for ; Sat, 20 Oct 2018 12:39:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727645AbeJTUuH (ORCPT ); Sat, 20 Oct 2018 16:50:07 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:39228 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727531AbeJTUuG (ORCPT ); Sat, 20 Oct 2018 16:50:06 -0400 Received: by mail-lj1-f195.google.com with SMTP id p1-v6so33094323ljg.6 for ; Sat, 20 Oct 2018 05:39:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Q9WWmR8nZyxJUY86EZUHofEX9Rtsin489A2I8rnCcYU=; b=I+2JHAJ85ZySn8mYQ991nVwI2Cozoj5cckkim5VYMIlCG75n2/fPmlg3QqAKN0pJJd Ao6xtrtSthbly9E5o7nG06S6oDtQx6q8Uh/cyFu6uoqe385mQeztTx3VJC626duUFoFr rhTNVMxgbugmDf+cUU6svAxluwRbWhEKAwQyRRflqPwY3OeExHCftsQwSD3+FFIKgvYk AWIPJ7rVrSBsCSptOdKzrNgWAjCLK7Zqk7ovKH0BpkuQb6wsXz3/GXQB29zdfe9qG6de +JyjK/drMIXCN0oT7tdB7wMtRhibEMn5LzVymlXYm+Lidiux89H9k71ftbTrxf+ZhN8A XSNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Q9WWmR8nZyxJUY86EZUHofEX9Rtsin489A2I8rnCcYU=; b=WvL/k+Gid2Sk3URYgCbUdC61aj9FMqVKIwYbeGGUXuSibEreIa3gV2rB6mp8oEfvzI TPxietZAUhKsDz1dhwzH2NW9A4yaSJS4QoeKZrF2TH6CHx5DN9P8zzc7x35WZe+YgeDV PNe3g36DR7C4wPlqrYe4Is6QjxCQz5O8hBudH8Lb9MW762k/mSm3YizQ3LAa8g7OAZOJ Hg/9ZaiN4yJEVkt92XUFoDRxaoYuMl5IqDS0uq77gFczmzFDkghhBon717Xs4Kgyi936 2W/2hYmolU2P3h7Npadm+83lmOio5xrKvyd+5EbVt7IlEWfUAESeSWjgShaN37vX1udf tG3A== X-Gm-Message-State: AGRZ1gIwpdCrfjF7FA502qVDfD16Ct7atP2+FF1JZKFLGuDNB8X5Y3cC qgtSs3Cdr/JLOuj2LyaMWtcfotRa X-Google-Smtp-Source: ACcGV61D9jNar2SXcFlSSFcJiqm7PZr5s1UMTif5v38MVjlJoU+X66lokDpld97HaJx3oYoHYJgj8A== X-Received: by 2002:a2e:574f:: with SMTP id r15-v6mr7507786ljd.106.1540039184609; Sat, 20 Oct 2018 05:39:44 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:44 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 31/59] config.txt: move instaweb.* to a separate file Date: Sat, 20 Oct 2018 14:38:20 +0200 Message-Id: <20181020123848.2785-32-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 21 +-------------------- Documentation/instaweb-config.txt | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 20 deletions(-) create mode 100644 Documentation/instaweb-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index c91dc2ceef..2d60aead5d 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -610,26 +610,7 @@ include::index-config.txt[] include::init-config.txt[] -instaweb.browser:: - Specify the program that will be used to browse your working - repository in gitweb. See linkgit:git-instaweb[1]. - -instaweb.httpd:: - The HTTP daemon command-line to start gitweb on your working - repository. See linkgit:git-instaweb[1]. - -instaweb.local:: - If true the web server started by linkgit:git-instaweb[1] will - be bound to the local IP (127.0.0.1). - -instaweb.modulePath:: - The default module path for linkgit:git-instaweb[1] to use - instead of /usr/lib/apache2/modules. Only used if httpd - is Apache. - -instaweb.port:: - The port number to bind the gitweb httpd to. See - linkgit:git-instaweb[1]. +include::instaweb-config.txt[] interactive.singleKey:: In interactive commands, allow the user to provide one-letter diff --git a/Documentation/instaweb-config.txt b/Documentation/instaweb-config.txt new file mode 100644 index 0000000000..50cb2f7d62 --- /dev/null +++ b/Documentation/instaweb-config.txt @@ -0,0 +1,20 @@ +instaweb.browser:: + Specify the program that will be used to browse your working + repository in gitweb. See linkgit:git-instaweb[1]. + +instaweb.httpd:: + The HTTP daemon command-line to start gitweb on your working + repository. See linkgit:git-instaweb[1]. + +instaweb.local:: + If true the web server started by linkgit:git-instaweb[1] will + be bound to the local IP (127.0.0.1). + +instaweb.modulePath:: + The default module path for linkgit:git-instaweb[1] to use + instead of /usr/lib/apache2/modules. Only used if httpd + is Apache. + +instaweb.port:: + The port number to bind the gitweb httpd to. See + linkgit:git-instaweb[1]. From patchwork Sat Oct 20 12:38:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650463 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 578D414E2 for ; Sat, 20 Oct 2018 12:39:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 416D02861D for ; Sat, 20 Oct 2018 12:39:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 358BE28620; Sat, 20 Oct 2018 12:39:51 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 C64762861D for ; Sat, 20 Oct 2018 12:39:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727651AbeJTUuJ (ORCPT ); Sat, 20 Oct 2018 16:50:09 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:40867 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727531AbeJTUuJ (ORCPT ); Sat, 20 Oct 2018 16:50:09 -0400 Received: by mail-lj1-f195.google.com with SMTP id r83-v6so33087113ljr.7 for ; Sat, 20 Oct 2018 05:39:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Aujn6cxwuo2c7cWTYiHNOiOlGt9ne6ZLph8m3K+LJXg=; b=gKKdBBvh304dCy7Qgn+zO2Q05ZmJUD+RdSU9/K81lhQGPJhGIZE++KNuV48s+yN4ZA O4oPMja2vTze/LFMm0iQ+tbg8JkiQdskp5i8nbu99U0p2ntOk9IbEIx1LeF9nYS1Zcxa Z2ELgCkVkcewsKlzJUeAfHskTYoevdRbcHLQHSPMBYBfpO6zZRzyqYP/+6sqZHyrTGp4 2soRZyfLQ75YsbQEPnyy9sTWvd5hPhzsCt73wu5syPi4O1DrpKfwOtj0vKEDJMBdmQGP yw66ZWTbTInd2O5JbE/7vx+zRhMp7DYHReQpBjGVfvm6Kli9Ih4JmH+TAAK/LxcZgK9j 7jIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Aujn6cxwuo2c7cWTYiHNOiOlGt9ne6ZLph8m3K+LJXg=; b=k/d85PoVQohRSSdTrSWTGWym+ska8QVExmz5XAn8+S8xLpJu/5pcs4Fmar+24DH6D9 x1L0cF1PgMB7D0CjgyD2IVf+eCBE9snJYT1QYjFS5QvXC0sc2ywaTGV0PihGH7+euamC N+pctnElvml+v7cLjwBbyNMlCJUZwGdmZ8pSgvXIKI5XGQ8B//2AUrbvWnPxNIThOUx9 3QkDnN2w41oT5Ag5jve1z30Ygw/Jw465iTDP0g0LHmqsMXx8+q01mR4qtaUjPKV5jio5 /c/9sdxUptB+5UmTok9PA1luod+8F/dsvaNfedmPhJ6fJUm0slW12+siZBZw6/lopnHo FyuA== X-Gm-Message-State: ABuFfoirHHnqr9fex9Re0Nzhx1YQ5vbFlGUhpTeL31sovbD6lq8XrTxl 8I3xP/suaWSw52VNqazgxh6MpWZ9 X-Google-Smtp-Source: ACcGV61WVFQk+K/ZkxELge2sVHh6GcXnqmP7UpJdvGTittkYL7MFoyUN32gtxyA2KbYrRml7cdVttA== X-Received: by 2002:a2e:505b:: with SMTP id v27-v6mr24571223ljd.126.1540039187479; Sat, 20 Oct 2018 05:39:47 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:46 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 32/59] config.txt: move interactive.* to a separate file Date: Sat, 20 Oct 2018 14:38:21 +0200 Message-Id: <20181020123848.2785-33-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 17 +---------------- Documentation/interactive-config.txt | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 Documentation/interactive-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 2d60aead5d..03d91ef5b9 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -612,22 +612,7 @@ include::init-config.txt[] include::instaweb-config.txt[] -interactive.singleKey:: - In interactive commands, allow the user to provide one-letter - input with a single key (i.e., without hitting enter). - Currently this is used by the `--patch` mode of - linkgit:git-add[1], linkgit:git-checkout[1], linkgit:git-commit[1], - linkgit:git-reset[1], and linkgit:git-stash[1]. Note that this - setting is silently ignored if portable keystroke input - is not available; requires the Perl module Term::ReadKey. - -interactive.diffFilter:: - When an interactive command (such as `git add --patch`) shows - a colorized diff, git will pipe the diff through the shell - command defined by this configuration variable. The command may - mark up the diff further for human consumption, provided that it - retains a one-to-one correspondence with the lines in the - original diff. Defaults to disabled (no filtering). +include::interactive-config.txt[] log.abbrevCommit:: If true, makes linkgit:git-log[1], linkgit:git-show[1], and diff --git a/Documentation/interactive-config.txt b/Documentation/interactive-config.txt new file mode 100644 index 0000000000..ad846dd7c9 --- /dev/null +++ b/Documentation/interactive-config.txt @@ -0,0 +1,16 @@ +interactive.singleKey:: + In interactive commands, allow the user to provide one-letter + input with a single key (i.e., without hitting enter). + Currently this is used by the `--patch` mode of + linkgit:git-add[1], linkgit:git-checkout[1], linkgit:git-commit[1], + linkgit:git-reset[1], and linkgit:git-stash[1]. Note that this + setting is silently ignored if portable keystroke input + is not available; requires the Perl module Term::ReadKey. + +interactive.diffFilter:: + When an interactive command (such as `git add --patch`) shows + a colorized diff, git will pipe the diff through the shell + command defined by this configuration variable. The command may + mark up the diff further for human consumption, provided that it + retains a one-to-one correspondence with the lines in the + original diff. Defaults to disabled (no filtering). From patchwork Sat Oct 20 12:38:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650465 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 D1D1190 for ; Sat, 20 Oct 2018 12:39:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BC00F2861D for ; Sat, 20 Oct 2018 12:39:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B016028623; Sat, 20 Oct 2018 12:39:53 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 2629E2861D for ; Sat, 20 Oct 2018 12:39:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727654AbeJTUuL (ORCPT ); Sat, 20 Oct 2018 16:50:11 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:41613 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727630AbeJTUuL (ORCPT ); Sat, 20 Oct 2018 16:50:11 -0400 Received: by mail-lj1-f195.google.com with SMTP id u21-v6so33075716lja.8 for ; Sat, 20 Oct 2018 05:39:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=brSJtUxYf+GNi2fl4K640sRD3ftbFk91wisdXkaSeJo=; b=HdB7hMjrBX+hnk3e5kwNJSAlykJiFfkS7AHZSQgUZ3X1JrzBEqY/ArC77HmQwkPm+s aWayv9qKDYpy7Kw7XABZa1k08qY2Uc6RaggQIuq8RgcM/YggyXW2Zcyj6J6TWpvNmhEC eDhAdp6KF5B/0oxD7RsAsfcD3wvoG8kcaZ3SGT9X4It9qnXq5ZvaDjbjA0BTnVrT1q4r j3JdugRDm0KJVyQh7hNv1p6B50VEYICDeLrFLqDORY9CA5Mqwuuh+dIjIMeXpEznmMUv 4dIkI1+7d2Q7h+IXpYhBE1GgQ2iVIdSSPlLzSdFk71x4Os/BsqAHYLls9CRS8ZgYXK5F ktmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=brSJtUxYf+GNi2fl4K640sRD3ftbFk91wisdXkaSeJo=; b=hONsGsOVFFxFS3xj0xUmmaOVq9peLO/hnOyoS0SjtVaH27Hz2oHjuurSPGrmWueGTX 4ZqGarcLUO+6PptimMjw5QhmsuiAjQGCbXfEBFgWlQX4V0P3gr1q5AVR5CNaiba0xZlW XBow7Fov7aLbv3CIPXVFssEb+U37RID4FMQDkei+X3euxNQvVPyugWKUwYjFdrqe7YpI cA9XL5K3Zp25scJMusyq3nkQhcR9CMWrMVHDYMA9R/yfR49BVwST6OtULOzj54obUdGR g+pMQ0lWFnOnE64i2rUxwHuiZHfvWQBg1XMfehHWY4yZ39qnhu7nINaLJm9Nwv7tv/if A17Q== X-Gm-Message-State: ABuFfog3sPkZ7gqZulY2wO5BLntKsTPmKOXUW2IW3jveGxrsTh35Rpw+ bdN0tAgFQKOfFwauPwAFxCvV2llP X-Google-Smtp-Source: ACcGV616iFESTLy7hfGeZmpK/4PhDsFF6vx+qCAECQa8LJEj3lmhUNgQ7iCB2vV9ZfoHRTxBHId8MQ== X-Received: by 2002:a2e:83d7:: with SMTP id s23-v6mr27128891ljh.0.1540039188739; Sat, 20 Oct 2018 05:39:48 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:48 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 33/59] config.txt: move log.* to a separate file Date: Sat, 20 Oct 2018 14:38:22 +0200 Message-Id: <20181020123848.2785-34-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 44 +----------------------------------- Documentation/log-config.txt | 43 +++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 43 deletions(-) create mode 100644 Documentation/log-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 03d91ef5b9..8d9423beca 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -614,49 +614,7 @@ include::instaweb-config.txt[] include::interactive-config.txt[] -log.abbrevCommit:: - If true, makes linkgit:git-log[1], linkgit:git-show[1], and - linkgit:git-whatchanged[1] assume `--abbrev-commit`. You may - override this option with `--no-abbrev-commit`. - -log.date:: - Set the default date-time mode for the 'log' command. - Setting a value for log.date is similar to using 'git log''s - `--date` option. See linkgit:git-log[1] for details. - -log.decorate:: - Print out the ref names of any commits that are shown by the log - command. If 'short' is specified, the ref name prefixes 'refs/heads/', - 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is - specified, the full ref name (including prefix) will be printed. - If 'auto' is specified, then if the output is going to a terminal, - the ref names are shown as if 'short' were given, otherwise no ref - names are shown. This is the same as the `--decorate` option - of the `git log`. - -log.follow:: - If `true`, `git log` will act as if the `--follow` option was used when - a single is given. This has the same limitations as `--follow`, - i.e. it cannot be used to follow multiple files and does not work well - on non-linear history. - -log.graphColors:: - A list of colors, separated by commas, that can be used to draw - history lines in `git log --graph`. - -log.showRoot:: - If true, the initial commit will be shown as a big creation event. - This is equivalent to a diff against an empty tree. - Tools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which - normally hide the root commit will now show it. True by default. - -log.showSignature:: - If true, makes linkgit:git-log[1], linkgit:git-show[1], and - linkgit:git-whatchanged[1] assume `--show-signature`. - -log.mailmap:: - If true, makes linkgit:git-log[1], linkgit:git-show[1], and - linkgit:git-whatchanged[1] assume `--use-mailmap`. +include::log-config.txt[] mailinfo.scissors:: If true, makes linkgit:git-mailinfo[1] (and therefore diff --git a/Documentation/log-config.txt b/Documentation/log-config.txt new file mode 100644 index 0000000000..78d9e4453a --- /dev/null +++ b/Documentation/log-config.txt @@ -0,0 +1,43 @@ +log.abbrevCommit:: + If true, makes linkgit:git-log[1], linkgit:git-show[1], and + linkgit:git-whatchanged[1] assume `--abbrev-commit`. You may + override this option with `--no-abbrev-commit`. + +log.date:: + Set the default date-time mode for the 'log' command. + Setting a value for log.date is similar to using 'git log''s + `--date` option. See linkgit:git-log[1] for details. + +log.decorate:: + Print out the ref names of any commits that are shown by the log + command. If 'short' is specified, the ref name prefixes 'refs/heads/', + 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is + specified, the full ref name (including prefix) will be printed. + If 'auto' is specified, then if the output is going to a terminal, + the ref names are shown as if 'short' were given, otherwise no ref + names are shown. This is the same as the `--decorate` option + of the `git log`. + +log.follow:: + If `true`, `git log` will act as if the `--follow` option was used when + a single is given. This has the same limitations as `--follow`, + i.e. it cannot be used to follow multiple files and does not work well + on non-linear history. + +log.graphColors:: + A list of colors, separated by commas, that can be used to draw + history lines in `git log --graph`. + +log.showRoot:: + If true, the initial commit will be shown as a big creation event. + This is equivalent to a diff against an empty tree. + Tools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which + normally hide the root commit will now show it. True by default. + +log.showSignature:: + If true, makes linkgit:git-log[1], linkgit:git-show[1], and + linkgit:git-whatchanged[1] assume `--show-signature`. + +log.mailmap:: + If true, makes linkgit:git-log[1], linkgit:git-show[1], and + linkgit:git-whatchanged[1] assume `--use-mailmap`. From patchwork Sat Oct 20 12:38:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650467 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 288E618A7 for ; Sat, 20 Oct 2018 12:39:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 12D9A2861D for ; Sat, 20 Oct 2018 12:39:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0733A28620; Sat, 20 Oct 2018 12:39:54 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 98FA62861E for ; Sat, 20 Oct 2018 12:39:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727664AbeJTUuM (ORCPT ); Sat, 20 Oct 2018 16:50:12 -0400 Received: from mail-lf1-f65.google.com ([209.85.167.65]:36459 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727652AbeJTUuM (ORCPT ); Sat, 20 Oct 2018 16:50:12 -0400 Received: by mail-lf1-f65.google.com with SMTP id l1-v6so7359293lfc.3 for ; Sat, 20 Oct 2018 05:39:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5rsne6amo62+etPNbiXJZoWBUZpPcXUqOElssLrFfYg=; b=G2wwZ0iJxInbJJH19kfGZxU9AmmLtenTWWxQn73CGnwHZZknlzYBoPHy2GxNbT9PiA IAi7r9oaukx30c8cAZpVHnHGMmgMIcb9tewNzGRHnMIPosbVSowTX5q01w9/s1bnU9UG fM/gasY4jy3LvayPhwQdEgTjQy0IY0zwjvF/oEVgEhdKO9NaUaO5ZsY7ssLNBg41Yt06 p65qoVdyi8pwlbtNA8rziXy4Wc1AZrlyDnPJC54Z1w+ZSxTw4bx1OxEMh7DAbVZnNr4u pi/Zo3qm99KgWIl0aJqjikjy8qlKncHW/y3uiYrar6H0yEML/u1dkm9hIJls7tt1b1y7 IV9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5rsne6amo62+etPNbiXJZoWBUZpPcXUqOElssLrFfYg=; b=EU5uXoieOxiRRe5zEUfUUlukj+XzZuz1E9k37ev9H3jIZhC7b3X71b5ZmixMTQ6PLS BhSQbCbiFJtRhPoTZK09Ym6kZojfmUpWRFK0M87InLVAd4/aLNDxaeEZQFcwoAPGkMRO RlzOqSYaBAIrVnGkeiIaQkhnFNXW5QrjHdxw54pgl2mRzwwE3uZ7QSUIxZo7f6coyUK0 CEYmQQIeSpqV6uRXSLSbMd+I7D+O9j/UxAgVOzJwdqP/psVq+evazm1FqWfviGhcZNwj HgMAoxEMSWvzQOdQ5TBQOgROJm5UKecSJLtjBIccciL08L79ywVsioeamsQBo/TpSCFh DKmQ== X-Gm-Message-State: ABuFfoiiXy0f6RO3ZqhpFmVcoBROv4dVH/h4qqnNxNDDiCV+eBoVMPxp G8WTV7f/qaER0Nogo/aZqXLYp0jT X-Google-Smtp-Source: ACcGV617SzxbflyajdP+ZQ15XP8j5w9G/EqJc3dhPo2JEX+8PZoWES/ZR2z0Io/1ItBj8tQtEcEveg== X-Received: by 2002:a19:f89:: with SMTP id 9mr5247419lfp.10.1540039189832; Sat, 20 Oct 2018 05:39:49 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:49 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 34/59] config.txt: move mailinfo.* to a separate file Date: Sat, 20 Oct 2018 14:38:23 +0200 Message-Id: <20181020123848.2785-35-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 7 +------ Documentation/mailinfo-config.txt | 6 ++++++ 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 Documentation/mailinfo-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 8d9423beca..ca178e2651 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -616,12 +616,7 @@ include::interactive-config.txt[] include::log-config.txt[] -mailinfo.scissors:: - If true, makes linkgit:git-mailinfo[1] (and therefore - linkgit:git-am[1]) act by default as if the --scissors option - was provided on the command-line. When active, this features - removes everything from the message body before a scissors - line (i.e. consisting mainly of ">8", "8<" and "-"). +include::mailinfo-config.txt[] mailmap.file:: The location of an augmenting mailmap file. The default diff --git a/Documentation/mailinfo-config.txt b/Documentation/mailinfo-config.txt new file mode 100644 index 0000000000..3854d4ae37 --- /dev/null +++ b/Documentation/mailinfo-config.txt @@ -0,0 +1,6 @@ +mailinfo.scissors:: + If true, makes linkgit:git-mailinfo[1] (and therefore + linkgit:git-am[1]) act by default as if the --scissors option + was provided on the command-line. When active, this features + removes everything from the message body before a scissors + line (i.e. consisting mainly of ">8", "8<" and "-"). From patchwork Sat Oct 20 12:38:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650471 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 60EE414E2 for ; Sat, 20 Oct 2018 12:39:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B7882861D for ; Sat, 20 Oct 2018 12:39:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3FF1228620; Sat, 20 Oct 2018 12:39:57 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 DB8F62861D for ; Sat, 20 Oct 2018 12:39:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727670AbeJTUuO (ORCPT ); Sat, 20 Oct 2018 16:50:14 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:44829 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727630AbeJTUuN (ORCPT ); Sat, 20 Oct 2018 16:50:13 -0400 Received: by mail-lj1-f196.google.com with SMTP id v6-v6so33058910ljc.11 for ; Sat, 20 Oct 2018 05:39:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/Le9E207ycCQIOQPXFNBdzwcvde4uwacQBcDxwooFvU=; b=LylOkapbslik03nNKkoYNfMDwUargAJLEibiWiBF4s5n4pHTK3iWugyOx/YCgqSznx YAjHLCgOvnJM+zLLKWm62EGSOhLMZGv1gGVYE1itqAKEnFwr6YV5jy7K64Dc60/ljaEz j21jwJCoPO29zrKKxT2xzf4j4p7yD+CPqnyPvJMBWQFtC6Iv+l/VkCgcF7jT324wJPq2 P0WjPuCwZz9t9RgUeAEBrVOEKezryt1ZWfBGUxFMna+oCYDR5RqW6mJlI5C9CSUpdWGd koUGXnksRkyMKqFMREwHMrE5w5p202Q0yrWdZy2jf1kAKB+yRDxujlkKIpGbLFcZS7eX d/PQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/Le9E207ycCQIOQPXFNBdzwcvde4uwacQBcDxwooFvU=; b=JKKx0yiP1Nr2/tNyILnnZfMjl4cWCL19HBegy2iifDyEiZdGNFYG8PmV4V6UFb/0YM qKVJDumJyhCZjc6zD49xkvlJgggw63QA/yBe24Kn5MWYj7jmk2/l92egq/6TwHjzsN/W IXv7IYc377kPUxrCVPuvghCQHE+eaJtMcXP4+t2QScZRVmv0VGtCbXDg3pBezejyiZ/r fbAzkigGYa5lRA5Khn2eKz6r3CzjwyltFj/IaVe6Nm63jtLr4Bwc16MNUGfT/QqqWaeZ 0GyaflFxa+tX036GrRHBEObCzxBe2DvU8d3VrL1RbdmH5Wq8lVi5GJkLZFOSkhOdzf08 ajRg== X-Gm-Message-State: ABuFfoheYSzod8yGrNe4kKu5otkcuufY2GrNeePgnCeYkcM7ZbBZq3x6 RzD9UQECjwQJX0WSVM+4/P2+BpZZ X-Google-Smtp-Source: AJdET5fWm2i2eQl7n5aeBCW5TReewLO3Oj/EJgcR3cgOALO/D3d55BuAtCtW2l146hZPWtIHFpDJxQ== X-Received: by 2002:a2e:5d8f:: with SMTP id v15-v6mr1094119lje.86.1540039191101; Sat, 20 Oct 2018 05:39:51 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:50 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 35/59] config.txt: move mailmap.* to a separate file Date: Sat, 20 Oct 2018 14:38:24 +0200 Message-Id: <20181020123848.2785-36-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 16 +--------------- Documentation/mailmap-config.txt | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 15 deletions(-) create mode 100644 Documentation/mailmap-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index ca178e2651..c057a290a4 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -618,21 +618,7 @@ include::log-config.txt[] include::mailinfo-config.txt[] -mailmap.file:: - The location of an augmenting mailmap file. The default - mailmap, located in the root of the repository, is loaded - first, then the mailmap file pointed to by this variable. - The location of the mailmap file may be in a repository - subdirectory, or somewhere outside of the repository itself. - See linkgit:git-shortlog[1] and linkgit:git-blame[1]. - -mailmap.blob:: - Like `mailmap.file`, but consider the value as a reference to a - blob in the repository. If both `mailmap.file` and - `mailmap.blob` are given, both are parsed, with entries from - `mailmap.file` taking precedence. In a bare repository, this - defaults to `HEAD:.mailmap`. In a non-bare repository, it - defaults to empty. +include::mailmap-config.txt[] man.viewer:: Specify the programs that may be used to display help in the diff --git a/Documentation/mailmap-config.txt b/Documentation/mailmap-config.txt new file mode 100644 index 0000000000..48cbc30722 --- /dev/null +++ b/Documentation/mailmap-config.txt @@ -0,0 +1,15 @@ +mailmap.file:: + The location of an augmenting mailmap file. The default + mailmap, located in the root of the repository, is loaded + first, then the mailmap file pointed to by this variable. + The location of the mailmap file may be in a repository + subdirectory, or somewhere outside of the repository itself. + See linkgit:git-shortlog[1] and linkgit:git-blame[1]. + +mailmap.blob:: + Like `mailmap.file`, but consider the value as a reference to a + blob in the repository. If both `mailmap.file` and + `mailmap.blob` are given, both are parsed, with entries from + `mailmap.file` taking precedence. In a bare repository, this + defaults to `HEAD:.mailmap`. In a non-bare repository, it + defaults to empty. From patchwork Sat Oct 20 12:38:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650469 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 8F10414E2 for ; Sat, 20 Oct 2018 12:39:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 77A082861D for ; Sat, 20 Oct 2018 12:39:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6988E28620; Sat, 20 Oct 2018 12:39:56 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 12EAA2861D for ; Sat, 20 Oct 2018 12:39:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727672AbeJTUuP (ORCPT ); Sat, 20 Oct 2018 16:50:15 -0400 Received: from mail-lf1-f65.google.com ([209.85.167.65]:43197 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727652AbeJTUuO (ORCPT ); Sat, 20 Oct 2018 16:50:14 -0400 Received: by mail-lf1-f65.google.com with SMTP id p34-v6so27138013lfg.10 for ; Sat, 20 Oct 2018 05:39:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2/sNaApBIyBZ7A54y0FtXxH1ysQkFibSOpvKt+9LCN4=; b=N0C8FvEtjzfCiobMymiFQXWSEiYcSRmv5NedYsgpSSFzlcIiszareozbtxFDmAYuEQ fG3qT2RfXQjBNbQHTXL0S8je/04IXb0Jq417E17zA5mbPg5E/BwqXWX3kPCVqLGqxlgY H/yQtXMhmdNQNSH4CKKAwTs5aqAcGZ6GnGdoXZW0cC3MfS6uZp2bBnDxW2Lv2MBf3VxQ KBtMu1UVnVVuUYrT4hxFdF0w7WvTGJy3avP5WCvs1yQ54NnbvfrfOt66oTiP4tc31/N0 +a00ydJ1WhWwQ5mg2q6ClCt1tck9cN/sCnvVFLBZ2HRcYWxJkorPPy9dlDxX00gGcTkA d5wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2/sNaApBIyBZ7A54y0FtXxH1ysQkFibSOpvKt+9LCN4=; b=ge4ecncKMem95f+mInK5jCK28I8iP0gvJcih/fL3tiXC6mS+pKZKoe03KrCZ9163Ke EhVNM3SDYJObV2UHsbfsafEKxtkAfi9/WPjoKWTsBy7nkihUWYEn1oiVOyUoBbcC+eoP KXt1jiK/WtyC2myS8/BctUTvTYOAL+0fip9iSs7MevQtiVhWleAHWR8OekxYzuL9xduL /EX96NFw7/Bq17S44EEmoLaJkzp5pTEj2OzS2ajYHLtZuUD/DGYlXwOK3ubkU0VM8Zur nNHtNUZATvSCGcpkP8yMj829B4gH2j1VQzsHftgkfpguSXFNtRNGoTndN0TbMbqP5AeY DHxQ== X-Gm-Message-State: ABuFfohuNt01VTEz8iG6qVxqmliNK6bsLbLk1gyJ0Zd4Jq3+x7Z0HAil RKqBCemrpyru0aaUk8eD7lYZnNgr X-Google-Smtp-Source: ACcGV62kGY1TyBevL7LiXjM8jH46/LiTLGIgYF5E2VBJhUnSv/ym713/2gzrfwsSDhINfH8q7W9brg== X-Received: by 2002:a19:5710:: with SMTP id l16-v6mr5675822lfb.71.1540039192117; Sat, 20 Oct 2018 05:39:52 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:51 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 36/59] config.txt: move man.* to a separate file Date: Sat, 20 Oct 2018 14:38:25 +0200 Message-Id: <20181020123848.2785-37-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 13 +------------ Documentation/man-config.txt | 12 ++++++++++++ 2 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 Documentation/man-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index c057a290a4..72222c113f 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -620,18 +620,7 @@ include::mailinfo-config.txt[] include::mailmap-config.txt[] -man.viewer:: - Specify the programs that may be used to display help in the - 'man' format. See linkgit:git-help[1]. - -man..cmd:: - Specify the command to invoke the specified man viewer. The - specified command is evaluated in shell with the man page - passed as argument. (See linkgit:git-help[1].) - -man..path:: - Override the path for the given tool that may be used to - display help in the 'man' format. See linkgit:git-help[1]. +include::man-config.txt[] include::merge-config.txt[] diff --git a/Documentation/man-config.txt b/Documentation/man-config.txt new file mode 100644 index 0000000000..a727d987a8 --- /dev/null +++ b/Documentation/man-config.txt @@ -0,0 +1,12 @@ +man.viewer:: + Specify the programs that may be used to display help in the + 'man' format. See linkgit:git-help[1]. + +man..cmd:: + Specify the command to invoke the specified man viewer. The + specified command is evaluated in shell with the man page + passed as argument. (See linkgit:git-help[1].) + +man..path:: + Override the path for the given tool that may be used to + display help in the 'man' format. See linkgit:git-help[1]. From patchwork Sat Oct 20 12:38:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650473 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 069AD14E2 for ; Sat, 20 Oct 2018 12:40:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E255A2861D for ; Sat, 20 Oct 2018 12:40:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D644D28620; Sat, 20 Oct 2018 12:40:01 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 440DC2861D for ; Sat, 20 Oct 2018 12:40:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727678AbeJTUuU (ORCPT ); Sat, 20 Oct 2018 16:50:20 -0400 Received: from mail-lf1-f65.google.com ([209.85.167.65]:40480 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727652AbeJTUuT (ORCPT ); Sat, 20 Oct 2018 16:50:19 -0400 Received: by mail-lf1-f65.google.com with SMTP id n3-v6so277685lfe.7 for ; Sat, 20 Oct 2018 05:39:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KD0pzZsa7CPaOV7bs3UOC3qINNG7OYxdJhHquCyF5ig=; b=JCtAA++rcLgz3FvYFO1rQfQEyM1HoWXUe2Bl1NJENBlUZCHKwPZoMItoJ1CpI2A97g Tbz5Cmvw11ZgdnEyaD47jFRD9b3UKErNyBprIfuWFzoVjeMVEbG5il09dEW0ONLVnSmC HWLq2c5TP4/Rj9A0Pyb/Z0c37//UJAIChgNXdxry5mgcphGXMyjAWlSG4IwjM0ocZfMF tKBs5I8DbcOoDqe/lBCm2+P0oapXF1KsXwDQoBl8C+x6wdwCVlhwaBy0Hs3YjOLOt+lJ 9hgxooLfvfREK41/Z06W1sviwBvG3JAqD76SCjrRseXTXu3IZCsrarVRuugiBoK9eJih +xpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KD0pzZsa7CPaOV7bs3UOC3qINNG7OYxdJhHquCyF5ig=; b=G93gc0be3JI9z61+q570aPbFe16dZqpdglfE67ZIqzJty+GVdVHH0oebJkxbILlF82 m+rbaF+fdAKiwXNHghyxL29zat/3gKu2PZzbKJQQKLxGsLY9kRTHpHH4YnyvkSJXMqbQ fgvDs+ZtAORsoVmKDqDd0NcZjV2h+VZbWq92IbvIT39+xD9Ui1a6W7OsKlsbz1FDyXaP keoLRJYeoulLb6w4v8d8GmzNPRKoaDKzuWGuz9rav+QJvlubkWTuBBy8QJCZLRlElDYz qtaucOuGQ+4pvszSMqF6bbLGLBf5nQIvZ1Di+DlaLZ+TU4Ccq9eIrvgpoR+NXxBHixLs FoqA== X-Gm-Message-State: ABuFfojYB5Kg4lrxSlVMJUbcDoJIiZsEGbP53Bq52I/Rnvfes85Hgd4t LsWCEKQU2a8xkecXDPt/3c1K8YJk X-Google-Smtp-Source: ACcGV63oWkRL91BADD6tlVoDdzzYc6W0qHkN84UnyMv4dzQq5OF+bOyD3fv6I0VENkKnobJrOW++Vw== X-Received: by 2002:a19:df54:: with SMTP id q20-v6mr5543335lfj.130.1540039196668; Sat, 20 Oct 2018 05:39:56 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:56 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 37/59] config.txt: move mergetool.* to a separate file Date: Sat, 20 Oct 2018 14:38:26 +0200 Message-Id: <20181020123848.2785-38-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 54 +----------------------------- Documentation/mergetool-config.txt | 53 +++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 53 deletions(-) create mode 100644 Documentation/mergetool-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 72222c113f..9acc42e3c2 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -624,59 +624,7 @@ include::man-config.txt[] include::merge-config.txt[] -mergetool..path:: - Override the path for the given tool. This is useful in case - your tool is not in the PATH. - -mergetool..cmd:: - Specify the command to invoke the specified merge tool. The - specified command is evaluated in shell with the following - variables available: 'BASE' is the name of a temporary file - containing the common base of the files to be merged, if available; - 'LOCAL' is the name of a temporary file containing the contents of - the file on the current branch; 'REMOTE' is the name of a temporary - file containing the contents of the file from the branch being - merged; 'MERGED' contains the name of the file to which the merge - tool should write the results of a successful merge. - -mergetool..trustExitCode:: - For a custom merge command, specify whether the exit code of - the merge command can be used to determine whether the merge was - successful. If this is not set to true then the merge target file - timestamp is checked and the merge assumed to have been successful - if the file has been updated, otherwise the user is prompted to - indicate the success of the merge. - -mergetool.meld.hasOutput:: - Older versions of `meld` do not support the `--output` option. - Git will attempt to detect whether `meld` supports `--output` - by inspecting the output of `meld --help`. Configuring - `mergetool.meld.hasOutput` will make Git skip these checks and - use the configured value instead. Setting `mergetool.meld.hasOutput` - to `true` tells Git to unconditionally use the `--output` option, - and `false` avoids using `--output`. - -mergetool.keepBackup:: - After performing a merge, the original file with conflict markers - can be saved as a file with a `.orig` extension. If this variable - is set to `false` then this file is not preserved. Defaults to - `true` (i.e. keep the backup files). - -mergetool.keepTemporaries:: - When invoking a custom merge tool, Git uses a set of temporary - files to pass to the tool. If the tool returns an error and this - variable is set to `true`, then these temporary files will be - preserved, otherwise they will be removed after the tool has - exited. Defaults to `false`. - -mergetool.writeToTemp:: - Git writes temporary 'BASE', 'LOCAL', and 'REMOTE' versions of - conflicting files in the worktree by default. Git will attempt - to use a temporary directory for these files when set `true`. - Defaults to `false`. - -mergetool.prompt:: - Prompt before each invocation of the merge resolution program. +include::mergetool-config.txt[] notes.mergeStrategy:: Which merge strategy to choose by default when resolving notes diff --git a/Documentation/mergetool-config.txt b/Documentation/mergetool-config.txt new file mode 100644 index 0000000000..09ed31dbfa --- /dev/null +++ b/Documentation/mergetool-config.txt @@ -0,0 +1,53 @@ +mergetool..path:: + Override the path for the given tool. This is useful in case + your tool is not in the PATH. + +mergetool..cmd:: + Specify the command to invoke the specified merge tool. The + specified command is evaluated in shell with the following + variables available: 'BASE' is the name of a temporary file + containing the common base of the files to be merged, if available; + 'LOCAL' is the name of a temporary file containing the contents of + the file on the current branch; 'REMOTE' is the name of a temporary + file containing the contents of the file from the branch being + merged; 'MERGED' contains the name of the file to which the merge + tool should write the results of a successful merge. + +mergetool..trustExitCode:: + For a custom merge command, specify whether the exit code of + the merge command can be used to determine whether the merge was + successful. If this is not set to true then the merge target file + timestamp is checked and the merge assumed to have been successful + if the file has been updated, otherwise the user is prompted to + indicate the success of the merge. + +mergetool.meld.hasOutput:: + Older versions of `meld` do not support the `--output` option. + Git will attempt to detect whether `meld` supports `--output` + by inspecting the output of `meld --help`. Configuring + `mergetool.meld.hasOutput` will make Git skip these checks and + use the configured value instead. Setting `mergetool.meld.hasOutput` + to `true` tells Git to unconditionally use the `--output` option, + and `false` avoids using `--output`. + +mergetool.keepBackup:: + After performing a merge, the original file with conflict markers + can be saved as a file with a `.orig` extension. If this variable + is set to `false` then this file is not preserved. Defaults to + `true` (i.e. keep the backup files). + +mergetool.keepTemporaries:: + When invoking a custom merge tool, Git uses a set of temporary + files to pass to the tool. If the tool returns an error and this + variable is set to `true`, then these temporary files will be + preserved, otherwise they will be removed after the tool has + exited. Defaults to `false`. + +mergetool.writeToTemp:: + Git writes temporary 'BASE', 'LOCAL', and 'REMOTE' versions of + conflicting files in the worktree by default. Git will attempt + to use a temporary directory for these files when set `true`. + Defaults to `false`. + +mergetool.prompt:: + Prompt before each invocation of the merge resolution program. From patchwork Sat Oct 20 12:38:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650475 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 39F8F90 for ; Sat, 20 Oct 2018 12:40:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 217092861D for ; Sat, 20 Oct 2018 12:40:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 14AE828620; Sat, 20 Oct 2018 12:40:04 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 70F492861D for ; Sat, 20 Oct 2018 12:40:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727683AbeJTUuW (ORCPT ); Sat, 20 Oct 2018 16:50:22 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:34860 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727652AbeJTUuW (ORCPT ); Sat, 20 Oct 2018 16:50:22 -0400 Received: by mail-lj1-f193.google.com with SMTP id o14-v6so33124569ljj.2 for ; Sat, 20 Oct 2018 05:40:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JjeEH7TfqW4rFXhWGewuJVvx95aQ9II2y9kCKBB+QIo=; b=jV1sjeWLnwnJfVc97m135lodHpoxoW36GXfEhGLDueo76m8BFhSDYzjDfjjb1yDxzz 8GMDHUHj5XIQh72oUk5Ok69Bt6KFgMvMSEMdqcvF39g6IFaRodpEsCW5VxUC9WvD4Mr0 61PtELT9FYFZm4ULvnoTF7V8V65DRsWfN8TgzP8gZ2sgeAwbNb8Q+sCSKR4wLGnoZFXb z45F1GMyipyWidoDlFL5417VzD30Fk087yrHqV4gzXH+/MrNEOlUENnTSQR9yD2FswkE +FcKQpWoNVKbGjf+lO30B9Kyy6g5jvQGdP60YUwfvhX3Eh3Xnt9vxtBL4BY7ofON3+qW VUBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JjeEH7TfqW4rFXhWGewuJVvx95aQ9II2y9kCKBB+QIo=; b=RDQf3ZtSV35PCkGf3Pgvszj3qu2sXSJkq5y6VpJQAFxuGZnvFnOriO2BtebVFaSbhk gpxjlzpUt40fyN50fYc9RGMWcmUmGXFbiX8MUTy6M/9ZcDr/sQhfpPwmFCHbLzN4/iRb TyLUsbz+vZpUbvE/mGuH78Kf6tqaK2j2fgXCo3LGVfXoeQGhhGZB09h1bQYto8pjbyn+ libIJu9nfa5+A0PBB4cCPXE9x37vWcRn4shLHnEvgeyxPKYhEf+m3EmyXNnbjIti2xvI TWs18QEtpTdZZc7MTa3z80Ja2fVrucX0XiyktsWg/EaESiPZrr3G0WgntuZpaguYx+Lg rKDg== X-Gm-Message-State: ABuFfojrLFQb0fdIkkBtmzf7xxKlxvL9Tm9EUwY2l/e+8FnRYiTFVNm2 RKCAXeE8CJXuhJllhBIW+8fl4aHo X-Google-Smtp-Source: ACcGV62KUm20hNlhzpun+4VBYSaNVPmFelsx+nbb1raVRIbHvzIl5K+nJwbAG98eEyHbecnjDTtw3g== X-Received: by 2002:a2e:84c5:: with SMTP id q5-v6mr13590845ljh.65.1540039199280; Sat, 20 Oct 2018 05:39:59 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:58 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 38/59] config.txt: move notes.* to a separate file Date: Sat, 20 Oct 2018 14:38:27 +0200 Message-Id: <20181020123848.2785-39-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 60 +--------------------------------- Documentation/notes-config.txt | 59 +++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 59 deletions(-) create mode 100644 Documentation/notes-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 9acc42e3c2..d1de7ccc89 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -626,65 +626,7 @@ include::merge-config.txt[] include::mergetool-config.txt[] -notes.mergeStrategy:: - Which merge strategy to choose by default when resolving notes - conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or - `cat_sort_uniq`. Defaults to `manual`. See "NOTES MERGE STRATEGIES" - section of linkgit:git-notes[1] for more information on each strategy. - -notes..mergeStrategy:: - Which merge strategy to choose when doing a notes merge into - refs/notes/. This overrides the more general - "notes.mergeStrategy". See the "NOTES MERGE STRATEGIES" section in - linkgit:git-notes[1] for more information on the available strategies. - -notes.displayRef:: - The (fully qualified) refname from which to show notes when - showing commit messages. The value of this variable can be set - to a glob, in which case notes from all matching refs will be - shown. You may also specify this configuration variable - several times. A warning will be issued for refs that do not - exist, but a glob that does not match any refs is silently - ignored. -+ -This setting can be overridden with the `GIT_NOTES_DISPLAY_REF` -environment variable, which must be a colon separated list of refs or -globs. -+ -The effective value of "core.notesRef" (possibly overridden by -GIT_NOTES_REF) is also implicitly added to the list of refs to be -displayed. - -notes.rewrite.:: - When rewriting commits with (currently `amend` or - `rebase`) and this variable is set to `true`, Git - automatically copies your notes from the original to the - rewritten commit. Defaults to `true`, but see - "notes.rewriteRef" below. - -notes.rewriteMode:: - When copying notes during a rewrite (see the - "notes.rewrite." option), determines what to do if - the target commit already has a note. Must be one of - `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. - Defaults to `concatenate`. -+ -This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` -environment variable. - -notes.rewriteRef:: - When copying notes during a rewrite, specifies the (fully - qualified) ref whose notes should be copied. The ref may be a - glob, in which case notes in all matching refs will be copied. - You may also specify this configuration several times. -+ -Does not have a default value; you must configure this variable to -enable note rewriting. Set it to `refs/notes/commits` to enable -rewriting for the default commit notes. -+ -This setting can be overridden with the `GIT_NOTES_REWRITE_REF` -environment variable, which must be a colon separated list of refs or -globs. +include::notes-config.txt[] pack.window:: The size of the window used by linkgit:git-pack-objects[1] when no diff --git a/Documentation/notes-config.txt b/Documentation/notes-config.txt new file mode 100644 index 0000000000..aeef56d49a --- /dev/null +++ b/Documentation/notes-config.txt @@ -0,0 +1,59 @@ +notes.mergeStrategy:: + Which merge strategy to choose by default when resolving notes + conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or + `cat_sort_uniq`. Defaults to `manual`. See "NOTES MERGE STRATEGIES" + section of linkgit:git-notes[1] for more information on each strategy. + +notes..mergeStrategy:: + Which merge strategy to choose when doing a notes merge into + refs/notes/. This overrides the more general + "notes.mergeStrategy". See the "NOTES MERGE STRATEGIES" section in + linkgit:git-notes[1] for more information on the available strategies. + +notes.displayRef:: + The (fully qualified) refname from which to show notes when + showing commit messages. The value of this variable can be set + to a glob, in which case notes from all matching refs will be + shown. You may also specify this configuration variable + several times. A warning will be issued for refs that do not + exist, but a glob that does not match any refs is silently + ignored. ++ +This setting can be overridden with the `GIT_NOTES_DISPLAY_REF` +environment variable, which must be a colon separated list of refs or +globs. ++ +The effective value of "core.notesRef" (possibly overridden by +GIT_NOTES_REF) is also implicitly added to the list of refs to be +displayed. + +notes.rewrite.:: + When rewriting commits with (currently `amend` or + `rebase`) and this variable is set to `true`, Git + automatically copies your notes from the original to the + rewritten commit. Defaults to `true`, but see + "notes.rewriteRef" below. + +notes.rewriteMode:: + When copying notes during a rewrite (see the + "notes.rewrite." option), determines what to do if + the target commit already has a note. Must be one of + `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. + Defaults to `concatenate`. ++ +This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` +environment variable. + +notes.rewriteRef:: + When copying notes during a rewrite, specifies the (fully + qualified) ref whose notes should be copied. The ref may be a + glob, in which case notes in all matching refs will be copied. + You may also specify this configuration several times. ++ +Does not have a default value; you must configure this variable to +enable note rewriting. Set it to `refs/notes/commits` to enable +rewriting for the default commit notes. ++ +This setting can be overridden with the `GIT_NOTES_REWRITE_REF` +environment variable, which must be a colon separated list of refs or +globs. From patchwork Sat Oct 20 12:38:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650481 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 45DFC1508 for ; Sat, 20 Oct 2018 12:40:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2EE2A2861D for ; Sat, 20 Oct 2018 12:40:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2377928620; Sat, 20 Oct 2018 12:40:09 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 28E7C2861D for ; Sat, 20 Oct 2018 12:40:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727699AbeJTUuY (ORCPT ); Sat, 20 Oct 2018 16:50:24 -0400 Received: from mail-lf1-f65.google.com ([209.85.167.65]:45183 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727652AbeJTUuY (ORCPT ); Sat, 20 Oct 2018 16:50:24 -0400 Received: by mail-lf1-f65.google.com with SMTP id c24-v6so677442lfi.12 for ; Sat, 20 Oct 2018 05:40:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HcBRJQxt9SGWPCOxiMKVC3pyH6cCfaXIKEt8evBxo2A=; b=SGADudFLGIRIdwIyyO3CZiou/iF3BVdnFBI9xpPqu8Awzq4rfc6pfSjP0wROyy4M/z lF5+Je/dMYujg18cOP4JtWWEKBHLx2ZLd2pvoT+njkB8k6iGA1MhlzcOiWgKUA+AU+mL ZAK3ycEHrZPK/tlK0M89doKWO2gd+/YaiHAQq5zVmjtr0ipPthj0JX6phAMQ4zMDXcf/ K9Mc+dc0elXruN7SoPt/6O3HaYbUBJFLsOUWz1t5xbxu2ow7mS8HHGP7iAgBOalx3aBw SaLFLMvyHeEhZnivnk4Gu86biBnmgnaTzC5df79fc719S3kuQ1T3zTL36sDTw1id6mQC pebg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HcBRJQxt9SGWPCOxiMKVC3pyH6cCfaXIKEt8evBxo2A=; b=fFMO8eIknmwCB5UKHnQGcSrvvHHcNnv7abxRM6YNnTHV4Ra/oHXFmy1nU2NkBQplj8 0RJquJIH/554eooeIgkKy0pASg1FT+XPBZnVSn/mSyS67qHcjyHsdeheSK3Uif9yqvjc KqvrQf1VPZmaHnahhg/c+DQS5KydRH9mjKfnhUBtDB+CNOMCHHjPeiR2m/WAhAY3bfbN 3o6QXtetSGod1bwMeYBR/LXkI/FVycBOZCTxJjvZW8RSPfgAMRTt+WMjeCgMgVqDLKEF I+z00vWpTyZI1wIjMK/XtvkN8qwaZ73fhZPEknKliJp1LvvzlGlz5ImCW6vw+QKVunJd TlCA== X-Gm-Message-State: ABuFfojkbft29PcVaq/rS9FXGc5iu9sxQUkfXxONQSV49XVu41rUl0G7 dn1TY5mILgltI4p6zH67ZmVgFBWc X-Google-Smtp-Source: ACcGV60WcUeP54itEpCd1l/PJflIqfe4j/n+Ia4LY1ZNXWi+qFPPrkqhW8y8mPgFG0tozmz3cPeaTg== X-Received: by 2002:a19:3809:: with SMTP id f9mr347375lfa.148.1540039201237; Sat, 20 Oct 2018 05:40:01 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.40.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:40:00 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 39/59] config.txt: move pack.* to a separate file Date: Sat, 20 Oct 2018 14:38:28 +0200 Message-Id: <20181020123848.2785-40-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 121 +--------------------------------- Documentation/pack-config.txt | 120 +++++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+), 120 deletions(-) create mode 100644 Documentation/pack-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index d1de7ccc89..45b184b247 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -628,126 +628,7 @@ include::mergetool-config.txt[] include::notes-config.txt[] -pack.window:: - The size of the window used by linkgit:git-pack-objects[1] when no - window size is given on the command line. Defaults to 10. - -pack.depth:: - The maximum delta depth used by linkgit:git-pack-objects[1] when no - maximum depth is given on the command line. Defaults to 50. - Maximum value is 4095. - -pack.windowMemory:: - The maximum size of memory that is consumed by each thread - in linkgit:git-pack-objects[1] for pack window memory when - no limit is given on the command line. The value can be - suffixed with "k", "m", or "g". When left unconfigured (or - set explicitly to 0), there will be no limit. - -pack.compression:: - An integer -1..9, indicating the compression level for objects - in a pack file. -1 is the zlib default. 0 means no - compression, and 1..9 are various speed/size tradeoffs, 9 being - slowest. If not set, defaults to core.compression. If that is - not set, defaults to -1, the zlib default, which is "a default - compromise between speed and compression (currently equivalent - to level 6)." -+ -Note that changing the compression level will not automatically recompress -all existing objects. You can force recompression by passing the -F option -to linkgit:git-repack[1]. - -pack.island:: - An extended regular expression configuring a set of delta - islands. See "DELTA ISLANDS" in linkgit:git-pack-objects[1] - for details. - -pack.islandCore:: - Specify an island name which gets to have its objects be - packed first. This creates a kind of pseudo-pack at the front - of one pack, so that the objects from the specified island are - hopefully faster to copy into any pack that should be served - to a user requesting these objects. In practice this means - that the island specified should likely correspond to what is - the most commonly cloned in the repo. See also "DELTA ISLANDS" - in linkgit:git-pack-objects[1]. - -pack.deltaCacheSize:: - The maximum memory in bytes used for caching deltas in - linkgit:git-pack-objects[1] before writing them out to a pack. - This cache is used to speed up the writing object phase by not - having to recompute the final delta result once the best match - for all objects is found. Repacking large repositories on machines - which are tight with memory might be badly impacted by this though, - especially if this cache pushes the system into swapping. - A value of 0 means no limit. The smallest size of 1 byte may be - used to virtually disable this cache. Defaults to 256 MiB. - -pack.deltaCacheLimit:: - The maximum size of a delta, that is cached in - linkgit:git-pack-objects[1]. This cache is used to speed up the - writing object phase by not having to recompute the final delta - result once the best match for all objects is found. - Defaults to 1000. Maximum value is 65535. - -pack.threads:: - Specifies the number of threads to spawn when searching for best - delta matches. This requires that linkgit:git-pack-objects[1] - be compiled with pthreads otherwise this option is ignored with a - warning. This is meant to reduce packing time on multiprocessor - machines. The required amount of memory for the delta search window - is however multiplied by the number of threads. - Specifying 0 will cause Git to auto-detect the number of CPU's - and set the number of threads accordingly. - -pack.indexVersion:: - Specify the default pack index version. Valid values are 1 for - legacy pack index used by Git versions prior to 1.5.2, and 2 for - the new pack index with capabilities for packs larger than 4 GB - as well as proper protection against the repacking of corrupted - packs. Version 2 is the default. Note that version 2 is enforced - and this config option ignored whenever the corresponding pack is - larger than 2 GB. -+ -If you have an old Git that does not understand the version 2 `*.idx` file, -cloning or fetching over a non native protocol (e.g. "http") -that will copy both `*.pack` file and corresponding `*.idx` file from the -other side may give you a repository that cannot be accessed with your -older version of Git. If the `*.pack` file is smaller than 2 GB, however, -you can use linkgit:git-index-pack[1] on the *.pack file to regenerate -the `*.idx` file. - -pack.packSizeLimit:: - The maximum size of a pack. This setting only affects - packing to a file when repacking, i.e. the git:// protocol - is unaffected. It can be overridden by the `--max-pack-size` - option of linkgit:git-repack[1]. Reaching this limit results - in the creation of multiple packfiles; which in turn prevents - bitmaps from being created. - The minimum size allowed is limited to 1 MiB. - The default is unlimited. - Common unit suffixes of 'k', 'm', or 'g' are - supported. - -pack.useBitmaps:: - When true, git will use pack bitmaps (if available) when packing - to stdout (e.g., during the server side of a fetch). Defaults to - true. You should not generally need to turn this off unless - you are debugging pack bitmaps. - -pack.writeBitmaps (deprecated):: - This is a deprecated synonym for `repack.writeBitmaps`. - -pack.writeBitmapHashCache:: - When true, git will include a "hash cache" section in the bitmap - index (if one is written). This cache can be used to feed git's - delta heuristics, potentially leading to better deltas between - bitmapped and non-bitmapped objects (e.g., when serving a fetch - between an older, bitmapped pack and objects that have been - pushed since the last gc). The downside is that it consumes 4 - bytes per object of disk space, and that JGit's bitmap - implementation does not understand it, causing it to complain if - Git and JGit are used on the same repository. Defaults to false. +include::pack-config.txt[] pager.:: If the value is boolean, turns on or off pagination of the diff --git a/Documentation/pack-config.txt b/Documentation/pack-config.txt new file mode 100644 index 0000000000..edac75c83f --- /dev/null +++ b/Documentation/pack-config.txt @@ -0,0 +1,120 @@ +pack.window:: + The size of the window used by linkgit:git-pack-objects[1] when no + window size is given on the command line. Defaults to 10. + +pack.depth:: + The maximum delta depth used by linkgit:git-pack-objects[1] when no + maximum depth is given on the command line. Defaults to 50. + Maximum value is 4095. + +pack.windowMemory:: + The maximum size of memory that is consumed by each thread + in linkgit:git-pack-objects[1] for pack window memory when + no limit is given on the command line. The value can be + suffixed with "k", "m", or "g". When left unconfigured (or + set explicitly to 0), there will be no limit. + +pack.compression:: + An integer -1..9, indicating the compression level for objects + in a pack file. -1 is the zlib default. 0 means no + compression, and 1..9 are various speed/size tradeoffs, 9 being + slowest. If not set, defaults to core.compression. If that is + not set, defaults to -1, the zlib default, which is "a default + compromise between speed and compression (currently equivalent + to level 6)." ++ +Note that changing the compression level will not automatically recompress +all existing objects. You can force recompression by passing the -F option +to linkgit:git-repack[1]. + +pack.island:: + An extended regular expression configuring a set of delta + islands. See "DELTA ISLANDS" in linkgit:git-pack-objects[1] + for details. + +pack.islandCore:: + Specify an island name which gets to have its objects be + packed first. This creates a kind of pseudo-pack at the front + of one pack, so that the objects from the specified island are + hopefully faster to copy into any pack that should be served + to a user requesting these objects. In practice this means + that the island specified should likely correspond to what is + the most commonly cloned in the repo. See also "DELTA ISLANDS" + in linkgit:git-pack-objects[1]. + +pack.deltaCacheSize:: + The maximum memory in bytes used for caching deltas in + linkgit:git-pack-objects[1] before writing them out to a pack. + This cache is used to speed up the writing object phase by not + having to recompute the final delta result once the best match + for all objects is found. Repacking large repositories on machines + which are tight with memory might be badly impacted by this though, + especially if this cache pushes the system into swapping. + A value of 0 means no limit. The smallest size of 1 byte may be + used to virtually disable this cache. Defaults to 256 MiB. + +pack.deltaCacheLimit:: + The maximum size of a delta, that is cached in + linkgit:git-pack-objects[1]. This cache is used to speed up the + writing object phase by not having to recompute the final delta + result once the best match for all objects is found. + Defaults to 1000. Maximum value is 65535. + +pack.threads:: + Specifies the number of threads to spawn when searching for best + delta matches. This requires that linkgit:git-pack-objects[1] + be compiled with pthreads otherwise this option is ignored with a + warning. This is meant to reduce packing time on multiprocessor + machines. The required amount of memory for the delta search window + is however multiplied by the number of threads. + Specifying 0 will cause Git to auto-detect the number of CPU's + and set the number of threads accordingly. + +pack.indexVersion:: + Specify the default pack index version. Valid values are 1 for + legacy pack index used by Git versions prior to 1.5.2, and 2 for + the new pack index with capabilities for packs larger than 4 GB + as well as proper protection against the repacking of corrupted + packs. Version 2 is the default. Note that version 2 is enforced + and this config option ignored whenever the corresponding pack is + larger than 2 GB. ++ +If you have an old Git that does not understand the version 2 `*.idx` file, +cloning or fetching over a non native protocol (e.g. "http") +that will copy both `*.pack` file and corresponding `*.idx` file from the +other side may give you a repository that cannot be accessed with your +older version of Git. If the `*.pack` file is smaller than 2 GB, however, +you can use linkgit:git-index-pack[1] on the *.pack file to regenerate +the `*.idx` file. + +pack.packSizeLimit:: + The maximum size of a pack. This setting only affects + packing to a file when repacking, i.e. the git:// protocol + is unaffected. It can be overridden by the `--max-pack-size` + option of linkgit:git-repack[1]. Reaching this limit results + in the creation of multiple packfiles; which in turn prevents + bitmaps from being created. + The minimum size allowed is limited to 1 MiB. + The default is unlimited. + Common unit suffixes of 'k', 'm', or 'g' are + supported. + +pack.useBitmaps:: + When true, git will use pack bitmaps (if available) when packing + to stdout (e.g., during the server side of a fetch). Defaults to + true. You should not generally need to turn this off unless + you are debugging pack bitmaps. + +pack.writeBitmaps (deprecated):: + This is a deprecated synonym for `repack.writeBitmaps`. + +pack.writeBitmapHashCache:: + When true, git will include a "hash cache" section in the bitmap + index (if one is written). This cache can be used to feed git's + delta heuristics, potentially leading to better deltas between + bitmapped and non-bitmapped objects (e.g., when serving a fetch + between an older, bitmapped pack and objects that have been + pushed since the last gc). The downside is that it consumes 4 + bytes per object of disk space, and that JGit's bitmap + implementation does not understand it, causing it to complain if + Git and JGit are used on the same repository. Defaults to false. From patchwork Sat Oct 20 12:38:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650477 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 6718190 for ; Sat, 20 Oct 2018 12:40:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 50D7F2861D for ; Sat, 20 Oct 2018 12:40:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 44D7828620; Sat, 20 Oct 2018 12:40:06 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 E568C2861D for ; Sat, 20 Oct 2018 12:40:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727703AbeJTUuZ (ORCPT ); Sat, 20 Oct 2018 16:50:25 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:36880 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727689AbeJTUuY (ORCPT ); Sat, 20 Oct 2018 16:50:24 -0400 Received: by mail-lj1-f193.google.com with SMTP id 63-v6so33122822ljs.4 for ; Sat, 20 Oct 2018 05:40:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WvxCDWGJzdwbeWceojoJOblvuON0Xh3qFQMZTNh4Hhs=; b=nzqqp0zM4SrADh9DbJNNZQn2ZesTqBtaRYU6d9qOV1EdvdEsdRV3e1HVt9yPFvZHF9 mtgyc7vCE6efwiXjplCqtTcZU2A5Aea5dO+syCuyK2wTtsafyrWvqdqi2QBfHG7+UtUj y+WuVVh+DDIsK9MDfS5YBpv8VianMFeuIU84wXnQysq3XAAN7A5pjSWuiU9/qakLvYYy FCoB5Se3iQh2hTohlpS8J+88I+PWkFgl5E6hBv7CPW4KD/GAHHCIwGJ7Z2XqzcwmPZKW DK+nfkDNVbCOykEHqI0wAjIMPueYTASYyYiUBpGj0JMic09ffwdcYX9lN7vQ06PWzjOH rNdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WvxCDWGJzdwbeWceojoJOblvuON0Xh3qFQMZTNh4Hhs=; b=jvktc4SA96MjCQd0B0/uQQ4sIuTdx7k0W4PA1w4LPNMlF75FTInKl6D5KGOxV/MgHw FLqEctLcbUhC6is05Dh9bX8oA4o49gabN4KZgyXjjKmayGfy3vPIOoFqK8iM6rf53+hN Nu9pFsVVaTQr08iYKz3t7hPVBdv3uP4t9+vbskqzm2yy4CBA1l3RY93akuLu15+xpjxw kntdWhEXvDEfphvqpXNLDUaYk5hA5h/ruLtGdXtEWB0CAONfwG3ATFZWgDMKT7QtSUax 3xOGZv3Jc7N4RN5OdxhXT5/265k+o0v7LZCjEuVABHmW8uLTy2q2XyTMUB4FiIZWPpfz Dqvw== X-Gm-Message-State: ABuFfojC210+wVtO7seO1ILC/STL3IvFRcrd9Z3VyvUlCF3mzLREID/Q UQ1NN25X95J8E/P4FMbLjU/BGgLy X-Google-Smtp-Source: ACcGV60LzJ5sHNdFwCncA/IdJpUzqnEJG0wNXIDKdzKgx27fpoyF7n7Ksv+KpKAByJWr8jbaWuwIwg== X-Received: by 2002:a2e:980f:: with SMTP id a15-v6mr27848062ljj.6.1540039202380; Sat, 20 Oct 2018 05:40:02 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.40.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:40:01 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 40/59] config.txt: move pager.* to a separate file Date: Sat, 20 Oct 2018 14:38:29 +0200 Message-Id: <20181020123848.2785-41-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 9 +-------- Documentation/pager-config.txt | 8 ++++++++ 2 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 Documentation/pager-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 45b184b247..656ae3158c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -630,14 +630,7 @@ include::notes-config.txt[] include::pack-config.txt[] -pager.:: - If the value is boolean, turns on or off pagination of the - output of a particular Git subcommand when writing to a tty. - Otherwise, turns on pagination for the subcommand using the - pager specified by the value of `pager.`. If `--paginate` - or `--no-pager` is specified on the command line, it takes - precedence over this option. To disable pagination for all - commands, set `core.pager` or `GIT_PAGER` to `cat`. +include::pager-config.txt[] pretty.:: Alias for a --pretty= format string, as specified in diff --git a/Documentation/pager-config.txt b/Documentation/pager-config.txt new file mode 100644 index 0000000000..d3731cf66c --- /dev/null +++ b/Documentation/pager-config.txt @@ -0,0 +1,8 @@ +pager.:: + If the value is boolean, turns on or off pagination of the + output of a particular Git subcommand when writing to a tty. + Otherwise, turns on pagination for the subcommand using the + pager specified by the value of `pager.`. If `--paginate` + or `--no-pager` is specified on the command line, it takes + precedence over this option. To disable pagination for all + commands, set `core.pager` or `GIT_PAGER` to `cat`. From patchwork Sat Oct 20 12:38:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650479 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 D03E814E2 for ; Sat, 20 Oct 2018 12:40:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B950C2861D for ; Sat, 20 Oct 2018 12:40:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ADA6328620; Sat, 20 Oct 2018 12:40:07 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 5875E2861D for ; Sat, 20 Oct 2018 12:40:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727705AbeJTUu0 (ORCPT ); Sat, 20 Oct 2018 16:50:26 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:44839 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727692AbeJTUuZ (ORCPT ); Sat, 20 Oct 2018 16:50:25 -0400 Received: by mail-lj1-f196.google.com with SMTP id v6-v6so33059186ljc.11 for ; Sat, 20 Oct 2018 05:40:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bq2v8XG3I6ZXS5wzDWHlkCZnFAQOuFdosvIfGuzxrsM=; b=T4zOovarfUPdCO2Dod7NAIpPM2/zB78TLGpqs8SmKhs47OPdxah0T5+wmcE2H115a3 xuf2VTaOFvlgHwmJ0P8sJYWGS0xHdS6dR2Q+C+J5iTvXeQxpz1JVGJHTWzJv6fgEr2Cl 87jP+h9UGSMvoq3cP7nCE4AAS6V2nKa/l4VN5Wg/nx7LzMFfcrC6l3rjfYq8YqgaXG2U WY5tkdHPd21BQsitwCqlf76TyAygfYuLD5dDjGgzsVJRApcY9eQoGLJxcYOA9vDVpk0A PcnxN3pkrLNJ047hCfy/q5m1blsdyBCknWtpOH+KB6umFN7+MEGwqCf+yee6DlsJjgwl fgaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bq2v8XG3I6ZXS5wzDWHlkCZnFAQOuFdosvIfGuzxrsM=; b=EYQ38mbAmGrHGutrSoKfGVcbDFGiGLs0pz73WontE35yIIJiNmHMnlNT7s/dZ18GcS MwhSiMuycjeOK4cB1BleKPkVBlNoirGUxSlsTNyWXQOpSZsKLg/+me34Zl3yPijm/Kkx FeaUFRI95d5La+fdNHlAxns6wIy1ZLCdUzeQfXsuzep6t9eq8T5ocedC/qovKca9iBoN aDW6I/cOU8vagBd1L782ETPSyFSlr5pZHZtj0HmuKTGQ7S5gj981QFNKIflCwrxX+rTg qGdi8pUQfKIsoOW3Gqk7bSlyKp5k5mati8QlzGVoPQc6puODbgxgu5AaxdW+CqCwsvLp u33Q== X-Gm-Message-State: ABuFfoixm2/G1A5GOtZGlwv56MEyS+tqMkbgrTaFpafxn1QlY25abvAT 5MOjKcxdWQ1ck7zVKb/KFFTfarvN X-Google-Smtp-Source: ACcGV62F0lae+71Y4qQOD0P8P8AKOwnGyk5iRmuxO82U76pcvJr0lhksA+0S5y2Q9voLFM4OSpXVOw== X-Received: by 2002:a2e:8146:: with SMTP id t6-v6mr25367693ljg.32.1540039203394; Sat, 20 Oct 2018 05:40:03 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.40.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:40:02 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 41/59] config.txt: move pretty.* to a separate file Date: Sat, 20 Oct 2018 14:38:30 +0200 Message-Id: <20181020123848.2785-42-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 10 +--------- Documentation/pretty-config.txt | 9 +++++++++ 2 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 Documentation/pretty-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 656ae3158c..364e5fdbf1 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -632,15 +632,7 @@ include::pack-config.txt[] include::pager-config.txt[] -pretty.:: - Alias for a --pretty= format string, as specified in - linkgit:git-log[1]. Any aliases defined here can be used just - as the built-in pretty formats could. For example, - running `git config pretty.changelog "format:* %H %s"` - would cause the invocation `git log --pretty=changelog` - to be equivalent to running `git log "--pretty=format:* %H %s"`. - Note that an alias with the same name as a built-in format - will be silently ignored. +include::pretty-config.txt[] protocol.allow:: If set, provide a user defined default policy for all protocols which diff --git a/Documentation/pretty-config.txt b/Documentation/pretty-config.txt new file mode 100644 index 0000000000..063c6b63d9 --- /dev/null +++ b/Documentation/pretty-config.txt @@ -0,0 +1,9 @@ +pretty.:: + Alias for a --pretty= format string, as specified in + linkgit:git-log[1]. Any aliases defined here can be used just + as the built-in pretty formats could. For example, + running `git config pretty.changelog "format:* %H %s"` + would cause the invocation `git log --pretty=changelog` + to be equivalent to running `git log "--pretty=format:* %H %s"`. + Note that an alias with the same name as a built-in format + will be silently ignored. From patchwork Sat Oct 20 12:38:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650483 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 8191F90 for ; Sat, 20 Oct 2018 12:40:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B7532861D for ; Sat, 20 Oct 2018 12:40:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5FFF128620; Sat, 20 Oct 2018 12:40:11 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 D4C3B2861D for ; Sat, 20 Oct 2018 12:40:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727710AbeJTUu3 (ORCPT ); Sat, 20 Oct 2018 16:50:29 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:40884 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727692AbeJTUu3 (ORCPT ); Sat, 20 Oct 2018 16:50:29 -0400 Received: by mail-lj1-f196.google.com with SMTP id r83-v6so33087473ljr.7 for ; Sat, 20 Oct 2018 05:40:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ADiVqlUm/b0kdF+Gkq/SFbu25n54BU53BlFuUamW26Y=; b=g2gQ7GLzq/YlGqYnRvoidWpj8QEpukqsWo0kMyRfQh5mxZdIQrVeE0uWVI8nYnLHJa tsfecIs4Cgt3dU5GfniOH9Unlro78Z0myDnbUKqR+jNvYirQZiM8f68Nmrts8C58hva5 21Jjl2A2QgRy2OPlDI3/4J868s3IlcFKR21LoGJzhs0AlGagBmCTo3QYQy1bWOmHw/G6 VFH6HnBNB0SuTLVfLFTWPM8iJm/zXxR15mww8H3ZhwOK5+AliwrfxDVBD/zzpIO54Svq c6ObTtxFkfdakEz8laqmzrcINiOyq6Aam/MnpSK1EPesZirMk+CY08y3sTg0ls+QDdLf E6kA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ADiVqlUm/b0kdF+Gkq/SFbu25n54BU53BlFuUamW26Y=; b=jBK5GoLmzAQtwZSYMRFGBfN3O068QIZxhHYwnZeZpl51/cx94oREk5cIRI7JveFI3c MmGSKLCUJ/kiYK6INGtugd50SkZXF9/T8yzE54xHhdWfP/7BogF4Y3SNXau51a+eodqJ jr6xpVDjxsiK98BtsWfTjGjVVEmNNeNd/Q7R+HKx5wsOP3DOU+j2zvwYNpfSC2UOREjb 2eUm9MaZsGXsP1XVIq2ww3KuZ9nqpHtCsGj0pZJ3c9bbAxLV++9TuiZBCuGZtb0EKp10 FoDfVzK8JZ3AqSqFRC8sUg6h+VfSNfF0hbrR+hJ36nXENq+BpylIKX2OcK9LmuvetW2v epwg== X-Gm-Message-State: ABuFfoiKy+ugvzHb8pzCok9HRqA84GtmBEQwBoQAI5l/PH1euK3HOiiJ PO1zi/nLJQtcbYWuCkG+n503xRWN X-Google-Smtp-Source: ACcGV62o7rftqmo0K95tJ+O6fLxqfH98Fjl4IQUelpXL/pbNZQ21NOptXXP2FcTXvQIweExXYL09Wg== X-Received: by 2002:a2e:1241:: with SMTP id t62-v6mr24483511lje.81.1540039206634; Sat, 20 Oct 2018 05:40:06 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.40.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:40:05 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 42/59] config.txt: move protocol.* to a separate file Date: Sat, 20 Oct 2018 14:38:31 +0200 Message-Id: <20181020123848.2785-43-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 65 +------------------------------ Documentation/protocol-config.txt | 64 ++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 64 deletions(-) create mode 100644 Documentation/protocol-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 364e5fdbf1..f57b494041 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -634,70 +634,7 @@ include::pager-config.txt[] include::pretty-config.txt[] -protocol.allow:: - If set, provide a user defined default policy for all protocols which - don't explicitly have a policy (`protocol..allow`). By default, - if unset, known-safe protocols (http, https, git, ssh, file) have a - default policy of `always`, known-dangerous protocols (ext) have a - default policy of `never`, and all other protocols have a default - policy of `user`. Supported policies: -+ --- - -* `always` - protocol is always able to be used. - -* `never` - protocol is never able to be used. - -* `user` - protocol is only able to be used when `GIT_PROTOCOL_FROM_USER` is - either unset or has a value of 1. This policy should be used when you want a - protocol to be directly usable by the user but don't want it used by commands which - execute clone/fetch/push commands without user input, e.g. recursive - submodule initialization. - --- - -protocol..allow:: - Set a policy to be used by protocol `` with clone/fetch/push - commands. See `protocol.allow` above for the available policies. -+ -The protocol names currently used by git are: -+ --- - - `file`: any local file-based path (including `file://` URLs, - or local paths) - - - `git`: the anonymous git protocol over a direct TCP - connection (or proxy, if configured) - - - `ssh`: git over ssh (including `host:path` syntax, - `ssh://`, etc). - - - `http`: git over http, both "smart http" and "dumb http". - Note that this does _not_ include `https`; if you want to configure - both, you must do so individually. - - - any external helpers are named by their protocol (e.g., use - `hg` to allow the `git-remote-hg` helper) --- - -protocol.version:: - Experimental. If set, clients will attempt to communicate with a - server using the specified protocol version. If unset, no - attempt will be made by the client to communicate using a - particular protocol version, this results in protocol version 0 - being used. - Supported versions: -+ --- - -* `0` - the original wire protocol. - -* `1` - the original wire protocol with the addition of a version string - in the initial response from the server. - -* `2` - link:technical/protocol-v2.html[wire protocol version 2]. - --- +include::protocol-config.txt[] include::pull-config.txt[] diff --git a/Documentation/protocol-config.txt b/Documentation/protocol-config.txt new file mode 100644 index 0000000000..bfccc07491 --- /dev/null +++ b/Documentation/protocol-config.txt @@ -0,0 +1,64 @@ +protocol.allow:: + If set, provide a user defined default policy for all protocols which + don't explicitly have a policy (`protocol..allow`). By default, + if unset, known-safe protocols (http, https, git, ssh, file) have a + default policy of `always`, known-dangerous protocols (ext) have a + default policy of `never`, and all other protocols have a default + policy of `user`. Supported policies: ++ +-- + +* `always` - protocol is always able to be used. + +* `never` - protocol is never able to be used. + +* `user` - protocol is only able to be used when `GIT_PROTOCOL_FROM_USER` is + either unset or has a value of 1. This policy should be used when you want a + protocol to be directly usable by the user but don't want it used by commands which + execute clone/fetch/push commands without user input, e.g. recursive + submodule initialization. + +-- + +protocol..allow:: + Set a policy to be used by protocol `` with clone/fetch/push + commands. See `protocol.allow` above for the available policies. ++ +The protocol names currently used by git are: ++ +-- + - `file`: any local file-based path (including `file://` URLs, + or local paths) + + - `git`: the anonymous git protocol over a direct TCP + connection (or proxy, if configured) + + - `ssh`: git over ssh (including `host:path` syntax, + `ssh://`, etc). + + - `http`: git over http, both "smart http" and "dumb http". + Note that this does _not_ include `https`; if you want to configure + both, you must do so individually. + + - any external helpers are named by their protocol (e.g., use + `hg` to allow the `git-remote-hg` helper) +-- + +protocol.version:: + Experimental. If set, clients will attempt to communicate with a + server using the specified protocol version. If unset, no + attempt will be made by the client to communicate using a + particular protocol version, this results in protocol version 0 + being used. + Supported versions: ++ +-- + +* `0` - the original wire protocol. + +* `1` - the original wire protocol with the addition of a version string + in the initial response from the server. + +* `2` - link:technical/protocol-v2.html[wire protocol version 2]. + +-- From patchwork Sat Oct 20 12:38:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650485 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 7A28790 for ; Sat, 20 Oct 2018 12:40:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 653CF2861D for ; Sat, 20 Oct 2018 12:40:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 59F5528623; Sat, 20 Oct 2018 12:40:13 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 A1CC12861D for ; Sat, 20 Oct 2018 12:40:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727714AbeJTUub (ORCPT ); Sat, 20 Oct 2018 16:50:31 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:41628 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727706AbeJTUub (ORCPT ); Sat, 20 Oct 2018 16:50:31 -0400 Received: by mail-lj1-f195.google.com with SMTP id u21-v6so33076126lja.8 for ; Sat, 20 Oct 2018 05:40:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yH94TrhZF2ayZTJ+c1L6TIwrTpWMhMUBh5nEHxR2In0=; b=Yph3O0tAGwMYgusEnSajwHWrj2Pvnj9vz3nUZszFMZIoyv68H9K2kXV1tpTTJKqmOw HD8V02F/gWo4Uc60RXZld9p1q+cqnLQtPjJKsA71hk/85fmDh/kWqjs/ul83Ogx6CCNI 56Z9/zg55XphQ+exKv8gcVP/hTCvMn/rmQR7uRLwzJDLQG1Ttf/XOFr3oDVMG7q4+Yz2 Qi5C9npxCN3IufcVmHo2jhTi484sA0MgrvSBVnGbV3ou84r31bmmnMFBkgqIhiYyPigk AXcxu/pKN9CVzC5/Q2WP7Vm4r7GjX3jzSR5kiVNSfEHmWXZn0XDcPe5Ks2ItIHd9VyA4 WN4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yH94TrhZF2ayZTJ+c1L6TIwrTpWMhMUBh5nEHxR2In0=; b=RPxoLlORdQ/kOykjfEDEB+C1Bnlw2+xduxpVMg0pPtzYMCPCf0DjTRrxYje1AmoUF2 lJ1qErvyt2dv8jHnVCSS7LD2sztMx3rJq+hsOw1g3TWwetpjFDwF0Xu5zhhOtgTZ5VYt jbGgo+tttFv6ew/iYUQpQiQWKCo6kHuczbYo7TxsyNOv40IrYY3urEg90BWCxSHWORSf kUC24apaQyQYlPUCaKOHPlhU+AgdT9XBGSeefZ9KvB1Dp5VE0kdb6Vkc1aoBu/c44+Qj PmjgyCD7NpNsiNgQtiBKa3AxH1wjjfN/dtz39mi7Z+AmqTe+TGBU6yOolCnvf30TyFDV s1CA== X-Gm-Message-State: ABuFfojrkEfQZIo/5S8uEyux4Z1R+x8K9FimeNVwJ+PBVcQ53I7S0XwD YB+yRMfCF1iH6pLNQ2C0QS3Opz0e X-Google-Smtp-Source: ACcGV615dkhYuyrqsLO+P+4DFWH3yl8Lay4MLHhwKctvQxtMyF8lpF31qidigVLeUGTtFpU6hePleQ== X-Received: by 2002:a2e:5159:: with SMTP id b25-v6mr27339291lje.156.1540039207835; Sat, 20 Oct 2018 05:40:07 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.40.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:40:06 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 43/59] config.txt: move remote.* to a separate file Date: Sat, 20 Oct 2018 14:38:32 +0200 Message-Id: <20181020123848.2785-44-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 79 +-------------------------------- Documentation/remote-config.txt | 78 ++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 78 deletions(-) create mode 100644 Documentation/remote-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index f57b494041..71844cf8e3 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -644,84 +644,7 @@ include::rebase-config.txt[] include::receive-config.txt[] -remote.pushDefault:: - The remote to push to by default. Overrides - `branch..remote` for all branches, and is overridden by - `branch..pushRemote` for specific branches. - -remote..url:: - The URL of a remote repository. See linkgit:git-fetch[1] or - linkgit:git-push[1]. - -remote..pushurl:: - The push URL of a remote repository. See linkgit:git-push[1]. - -remote..proxy:: - For remotes that require curl (http, https and ftp), the URL to - the proxy to use for that remote. Set to the empty string to - disable proxying for that remote. - -remote..proxyAuthMethod:: - For remotes that require curl (http, https and ftp), the method to use for - authenticating against the proxy in use (probably set in - `remote..proxy`). See `http.proxyAuthMethod`. - -remote..fetch:: - The default set of "refspec" for linkgit:git-fetch[1]. See - linkgit:git-fetch[1]. - -remote..push:: - The default set of "refspec" for linkgit:git-push[1]. See - linkgit:git-push[1]. - -remote..mirror:: - If true, pushing to this remote will automatically behave - as if the `--mirror` option was given on the command line. - -remote..skipDefaultUpdate:: - If true, this remote will be skipped by default when updating - using linkgit:git-fetch[1] or the `update` subcommand of - linkgit:git-remote[1]. - -remote..skipFetchAll:: - If true, this remote will be skipped by default when updating - using linkgit:git-fetch[1] or the `update` subcommand of - linkgit:git-remote[1]. - -remote..receivepack:: - The default program to execute on the remote side when pushing. See - option --receive-pack of linkgit:git-push[1]. - -remote..uploadpack:: - The default program to execute on the remote side when fetching. See - option --upload-pack of linkgit:git-fetch-pack[1]. - -remote..tagOpt:: - Setting this value to --no-tags disables automatic tag following when - fetching from remote . Setting it to --tags will fetch every - tag from remote , even if they are not reachable from remote - branch heads. Passing these flags directly to linkgit:git-fetch[1] can - override this setting. See options --tags and --no-tags of - linkgit:git-fetch[1]. - -remote..vcs:: - Setting this to a value will cause Git to interact with - the remote with the git-remote- helper. - -remote..prune:: - When set to true, fetching from this remote by default will also - remove any remote-tracking references that no longer exist on the - remote (as if the `--prune` option was given on the command line). - Overrides `fetch.prune` settings, if any. - -remote..pruneTags:: - When set to true, fetching from this remote by default will also - remove any local tags that no longer exist on the remote if pruning - is activated in general via `remote..prune`, `fetch.prune` or - `--prune`. Overrides `fetch.pruneTags` settings, if any. -+ -See also `remote..prune` and the PRUNING section of -linkgit:git-fetch[1]. +include::remote-config.txt[] remotes.:: The list of remotes which are fetched by "git remote update diff --git a/Documentation/remote-config.txt b/Documentation/remote-config.txt new file mode 100644 index 0000000000..6c4cad83a2 --- /dev/null +++ b/Documentation/remote-config.txt @@ -0,0 +1,78 @@ +remote.pushDefault:: + The remote to push to by default. Overrides + `branch..remote` for all branches, and is overridden by + `branch..pushRemote` for specific branches. + +remote..url:: + The URL of a remote repository. See linkgit:git-fetch[1] or + linkgit:git-push[1]. + +remote..pushurl:: + The push URL of a remote repository. See linkgit:git-push[1]. + +remote..proxy:: + For remotes that require curl (http, https and ftp), the URL to + the proxy to use for that remote. Set to the empty string to + disable proxying for that remote. + +remote..proxyAuthMethod:: + For remotes that require curl (http, https and ftp), the method to use for + authenticating against the proxy in use (probably set in + `remote..proxy`). See `http.proxyAuthMethod`. + +remote..fetch:: + The default set of "refspec" for linkgit:git-fetch[1]. See + linkgit:git-fetch[1]. + +remote..push:: + The default set of "refspec" for linkgit:git-push[1]. See + linkgit:git-push[1]. + +remote..mirror:: + If true, pushing to this remote will automatically behave + as if the `--mirror` option was given on the command line. + +remote..skipDefaultUpdate:: + If true, this remote will be skipped by default when updating + using linkgit:git-fetch[1] or the `update` subcommand of + linkgit:git-remote[1]. + +remote..skipFetchAll:: + If true, this remote will be skipped by default when updating + using linkgit:git-fetch[1] or the `update` subcommand of + linkgit:git-remote[1]. + +remote..receivepack:: + The default program to execute on the remote side when pushing. See + option --receive-pack of linkgit:git-push[1]. + +remote..uploadpack:: + The default program to execute on the remote side when fetching. See + option --upload-pack of linkgit:git-fetch-pack[1]. + +remote..tagOpt:: + Setting this value to --no-tags disables automatic tag following when + fetching from remote . Setting it to --tags will fetch every + tag from remote , even if they are not reachable from remote + branch heads. Passing these flags directly to linkgit:git-fetch[1] can + override this setting. See options --tags and --no-tags of + linkgit:git-fetch[1]. + +remote..vcs:: + Setting this to a value will cause Git to interact with + the remote with the git-remote- helper. + +remote..prune:: + When set to true, fetching from this remote by default will also + remove any remote-tracking references that no longer exist on the + remote (as if the `--prune` option was given on the command line). + Overrides `fetch.prune` settings, if any. + +remote..pruneTags:: + When set to true, fetching from this remote by default will also + remove any local tags that no longer exist on the remote if pruning + is activated in general via `remote..prune`, `fetch.prune` or + `--prune`. Overrides `fetch.pruneTags` settings, if any. ++ +See also `remote..prune` and the PRUNING section of +linkgit:git-fetch[1]. From patchwork Sat Oct 20 12:38:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650487 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 A32821508 for ; Sat, 20 Oct 2018 12:40:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8E18C2861D for ; Sat, 20 Oct 2018 12:40:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 82B9D28620; Sat, 20 Oct 2018 12:40:13 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 289A82861E for ; Sat, 20 Oct 2018 12:40:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727718AbeJTUuc (ORCPT ); Sat, 20 Oct 2018 16:50:32 -0400 Received: from mail-lf1-f66.google.com ([209.85.167.66]:39527 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727692AbeJTUub (ORCPT ); Sat, 20 Oct 2018 16:50:31 -0400 Received: by mail-lf1-f66.google.com with SMTP id p11-v6so717825lfc.6 for ; Sat, 20 Oct 2018 05:40:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MbRW1ApzkAZI4YMS40CJYJyyLyq9E03qmWv3FboBQx8=; b=ZO5asg35QxQi51IC2F0Pr8/c5KfPiKYp+ssnMSJKW6kmMCvKZpQPm1kWKyd6Ysy+7g 95cyYHwMCf8GFqrWq4l6dqgrzGkwMEpxJXV6q9rBw8HGHuTeR6iUwml+p+1mORSsbfu4 BBSc+Z8qrXV+Dozjh04lN9rDC/TN6U+wiQ+kjkptaSEB3feUPrUHHoJUp51HfeXSi/Dw G7EYC67Rtvf33UQZMtheTrVMd/1/3DWRtIMhqqFntNwvmKespLykjRhRPjhuou1G+KRA zaNw5z9qmbA4QDTkFz8HT4wSuW1fQZlpM6YZdC3oZDr+D/VKTKTy9IWvp43CBx9H7j/W C8eA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MbRW1ApzkAZI4YMS40CJYJyyLyq9E03qmWv3FboBQx8=; b=byHVShGQy3o990/EOHF4w7NXsYTZl/a8XX72YTkVnhNPvCMHDffEWbf2MTdm2lwxn+ sxb2zvcodNbEYU7qbcIQm/QJgxtxC4M/l8nIIir9KfepN9QCS5EKQiWTJ9mLxAEPW4eX NLTSI576lj+Z2pwL/TrPKTFk86aTQ6mh1xLCJV/2Y0cM3slLY9LeZ6YwS7/i+W1U1d6X 6ji6syMMVZIjy/xuKvLGBCkNl9304/degAnYuWyaDegApfohuKfG0wbu42MDRFCjqZO1 sHxely2+aFqWqWeGcLOhE8kwwnK7o81U3d2UeKN+RZ7rAnlA8+Ef4a0+38ENhrPPvsdV gaSQ== X-Gm-Message-State: ABuFfoh2nv3EqWIkEosXXw177/ky7vfL9b0C2hTrq0aPTGydAMQWhnGL tYgPWoxMEl8mnjbvyruxBvFrnOmy X-Google-Smtp-Source: ACcGV63DRuueZ9jG9LMQd3WVVdYmluywlwf/T5C3hCgjmqVFFvbi+FifJPch2+nXU4VmKB7d29cEoA== X-Received: by 2002:a19:cb94:: with SMTP id b142mr5543922lfg.117.1540039209115; Sat, 20 Oct 2018 05:40:09 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.40.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:40:08 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 44/59] config.txt: move remotes.* to a separate file Date: Sat, 20 Oct 2018 14:38:33 +0200 Message-Id: <20181020123848.2785-45-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 4 +--- Documentation/remotes-config.txt | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 Documentation/remotes-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 71844cf8e3..ec8b61e1ba 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -646,9 +646,7 @@ include::receive-config.txt[] include::remote-config.txt[] -remotes.:: - The list of remotes which are fetched by "git remote update - ". See linkgit:git-remote[1]. +include::remotes-config.txt[] repack.useDeltaBaseOffset:: By default, linkgit:git-repack[1] creates packs that use diff --git a/Documentation/remotes-config.txt b/Documentation/remotes-config.txt new file mode 100644 index 0000000000..4cfe03221e --- /dev/null +++ b/Documentation/remotes-config.txt @@ -0,0 +1,3 @@ +remotes.:: + The list of remotes which are fetched by "git remote update + ". See linkgit:git-remote[1]. From patchwork Sat Oct 20 12:38:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650489 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 A832E14E2 for ; Sat, 20 Oct 2018 12:40:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 939BE28620 for ; Sat, 20 Oct 2018 12:40:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8820628623; Sat, 20 Oct 2018 12:40:15 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 165F82861D for ; Sat, 20 Oct 2018 12:40:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727724AbeJTUud (ORCPT ); Sat, 20 Oct 2018 16:50:33 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:40887 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727711AbeJTUud (ORCPT ); Sat, 20 Oct 2018 16:50:33 -0400 Received: by mail-lj1-f196.google.com with SMTP id r83-v6so33087542ljr.7 for ; Sat, 20 Oct 2018 05:40:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fBS3t6UklLLosk0faAgQoTDvcgou98WfB2fVt8XNgI8=; b=fc0rFTZaBbRnUVcTytVQfj/DAEP3tZ0/y1vUatUJ9dReCxOHwFewMR32KlDjK5RC9W nyOYEMG8v3j+6ZelUfx5ELE9jYHQ6JfNZ39r0YN0zYky3dxX7I+j9H4hSRvbNaqt9Stb 4aIGMS/V4yCFlCp2KAHmE68QOj5P/jOpTwDxAjjhT0wEn4HRqIsY29oI+uFM0vlzm/Fn KX7kj5ZGrFVrdt7Ny0jA3ZHWDZ7w00QsJx+Om0/Up7sD26z0W8JCkaeiCQLE8a4TTL77 ljmoOa0dxFjsMGbCxS14ofj9IqfOxSHmsbiBc0dP8SqgMU0BAagjGUX52pSnXd56Leth hTlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fBS3t6UklLLosk0faAgQoTDvcgou98WfB2fVt8XNgI8=; b=BRRul018IUwYYKXCKkIa2KbPVUSxYYmL/W5mQ1uHLNxiTN+v/oOceeOlhQiN5GitqY vLuREhB9xZIDSC2ScowWgRgZ2xmxcGDLHRIOr/BJF0qKHFYogMr/00rKUFm4V4VaQqJd +Ci5VbaiTsepaummyKR8Lsvm1NpF8lOc0Q33YgvwYADMVX9GbaH2idTlHY7bIu0+qnh6 25ZymDOF2i1oOiyfQ/5e4QVpDSjX/ZxJBffU+PxueCy6QCT4PBOCFGMJ71WLbFbwFHub CNC1wE0M6zKUPrPAVAGtzZQCiq+h+emnFcWs9q1i2fNFubRuyF2bFlPCcE2zYdZ2cSZc Rx1Q== X-Gm-Message-State: ABuFfojFDlHcnq0UmF8u1cIS5jz73dP7JOHluEA6IS0qB9YMbCxU/JkT S4xckhnFMnayzIqNIRWkJ48VbIpm X-Google-Smtp-Source: ACcGV61XuUu+8rIChYgT22SzI62OHAvQ84AUqENivo34XWMHYUlVv675ZmjfEXVkJw8zWlMXglf7FQ== X-Received: by 2002:a2e:7d10:: with SMTP id y16-v6mr20429215ljc.37.1540039210221; Sat, 20 Oct 2018 05:40:10 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.40.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:40:09 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 45/59] config.txt: move repack.* to a separate file Date: Sat, 20 Oct 2018 14:38:34 +0200 Message-Id: <20181020123848.2785-46-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 28 +--------------------------- Documentation/repack-config.txt | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 27 deletions(-) create mode 100644 Documentation/repack-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index ec8b61e1ba..c3618b00a4 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -648,33 +648,7 @@ include::remote-config.txt[] include::remotes-config.txt[] -repack.useDeltaBaseOffset:: - By default, linkgit:git-repack[1] creates packs that use - delta-base offset. If you need to share your repository with - Git older than version 1.4.4, either directly or via a dumb - protocol such as http, then you need to set this option to - "false" and repack. Access from old Git versions over the - native protocol are unaffected by this option. - -repack.packKeptObjects:: - If set to true, makes `git repack` act as if - `--pack-kept-objects` was passed. See linkgit:git-repack[1] for - details. Defaults to `false` normally, but `true` if a bitmap - index is being written (either via `--write-bitmap-index` or - `repack.writeBitmaps`). - -repack.useDeltaIslands:: - If set to true, makes `git repack` act as if `--delta-islands` - was passed. Defaults to `false`. - -repack.writeBitmaps:: - When true, git will write a bitmap index when packing all - objects to disk (e.g., when `git repack -a` is run). This - index can speed up the "counting objects" phase of subsequent - packs created for clones and fetches, at the cost of some disk - space and extra time spent on the initial repack. This has - no effect if multiple packfiles are created. - Defaults to false. +include::repack-config.txt[] rerere.autoUpdate:: When set to true, `git-rerere` updates the index with the diff --git a/Documentation/repack-config.txt b/Documentation/repack-config.txt new file mode 100644 index 0000000000..a5c37813fd --- /dev/null +++ b/Documentation/repack-config.txt @@ -0,0 +1,27 @@ +repack.useDeltaBaseOffset:: + By default, linkgit:git-repack[1] creates packs that use + delta-base offset. If you need to share your repository with + Git older than version 1.4.4, either directly or via a dumb + protocol such as http, then you need to set this option to + "false" and repack. Access from old Git versions over the + native protocol are unaffected by this option. + +repack.packKeptObjects:: + If set to true, makes `git repack` act as if + `--pack-kept-objects` was passed. See linkgit:git-repack[1] for + details. Defaults to `false` normally, but `true` if a bitmap + index is being written (either via `--write-bitmap-index` or + `repack.writeBitmaps`). + +repack.useDeltaIslands:: + If set to true, makes `git repack` act as if `--delta-islands` + was passed. Defaults to `false`. + +repack.writeBitmaps:: + When true, git will write a bitmap index when packing all + objects to disk (e.g., when `git repack -a` is run). This + index can speed up the "counting objects" phase of subsequent + packs created for clones and fetches, at the cost of some disk + space and extra time spent on the initial repack. This has + no effect if multiple packfiles are created. + Defaults to false. From patchwork Sat Oct 20 12:38:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650491 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 C5F193CF1 for ; Sat, 20 Oct 2018 12:40:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B10632861D for ; Sat, 20 Oct 2018 12:40:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A536628620; Sat, 20 Oct 2018 12:40:15 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 458CC2861E for ; Sat, 20 Oct 2018 12:40:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727728AbeJTUue (ORCPT ); Sat, 20 Oct 2018 16:50:34 -0400 Received: from mail-lf1-f68.google.com ([209.85.167.68]:36486 "EHLO mail-lf1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727692AbeJTUud (ORCPT ); Sat, 20 Oct 2018 16:50:33 -0400 Received: by mail-lf1-f68.google.com with SMTP id l1-v6so7359736lfc.3 for ; Sat, 20 Oct 2018 05:40:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KK/IxJ8/yYtcAG1hzYOE+JBsfrIT6Y0O5GI0yhBSCo8=; b=FDnPhxbAyIESooc/0BeCcYj0osTzztkW69GrVV4vluTqkkltO1tcADnppsaqESlCpN /zBXVfFAdF/1ynIYVTxRV/eaqFA/pGd+mNskzXI8YRTEs0twncvsqBfyNaYH+pq7T0E7 UJoav9c0dfzJAKgE+ig+yNzBDCFwjqVUgOL1GbFfy8WOlxrKCOpbNqvDmKQ0MO3PniwK kSyINQqjIZpazas2V2QSAZLHMN3yRrkDGwXVox5Y0GARz2Gpr0YbREerNS315FW0L4bt txxs8sgHCUEHpK/5aZ1VVBgSbkHgpmWZIYmHF0jJUK8QdAtuxluQovQRdlC+6SVxsREp vUrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KK/IxJ8/yYtcAG1hzYOE+JBsfrIT6Y0O5GI0yhBSCo8=; b=tlfquDqUh+jBJh08CwIWxVOKNG5y9JJJTn9YzXwIAckeY/WgsOn/eIFe6rijH7gdTJ hZcmQZlx/gHUMAH3g7IQudsFLv9cZy96gqEMLv6KSOFZKTMiG/jg+nVeQ8bclgB/026f N/zjwYS6SRtaMQDxHanQ6UzOesCBCcNtn3EEvJ15zFHqJx852YCurAbsIvv4ae7QR8G1 vZAqyiVQOiVEl6CL/mEhnBci0rLLtV4w4SdfSWW8jHaTEKtFe1p4wQ0hMv4/vp3XCum1 +dFoUHKzpnQRPc5T4Z/qBqw1R951GCrnFMofsekm6zPTb/T09ZSddQo1f+xw7XXG07mO x2Yw== X-Gm-Message-State: ABuFfoirYE46lrNA+PJnGJy5ylDTajM2gqSNLsNaU1S7qecyHt/bYHKd qJWVwzyYfznB1RK96rAEVWEeAMUK X-Google-Smtp-Source: ACcGV63Le0e9wZ+vhJoGW0wpnmmyGRZpPQAemEX/sWoAYY6BU2b/WZGJr+uRpibUBJpvy6rEXBWwwg== X-Received: by 2002:a19:11c2:: with SMTP id 63mr5101475lfr.131.1540039211552; Sat, 20 Oct 2018 05:40:11 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.40.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:40:10 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 46/59] config.txt: move rerere.* to a separate file Date: Sat, 20 Oct 2018 14:38:35 +0200 Message-Id: <20181020123848.2785-47-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 13 +------------ Documentation/rerere-config.txt | 12 ++++++++++++ 2 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 Documentation/rerere-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index c3618b00a4..f42b69f3b0 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -650,18 +650,7 @@ include::remotes-config.txt[] include::repack-config.txt[] -rerere.autoUpdate:: - When set to true, `git-rerere` updates the index with the - resulting contents after it cleanly resolves conflicts using - previously recorded resolution. Defaults to false. - -rerere.enabled:: - Activate recording of resolved conflicts, so that identical - conflict hunks can be resolved automatically, should they be - encountered again. By default, linkgit:git-rerere[1] is - enabled if there is an `rr-cache` directory under the - `$GIT_DIR`, e.g. if "rerere" was previously used in the - repository. +include::rerere-config.txt[] include::sendemail-config.txt[] diff --git a/Documentation/rerere-config.txt b/Documentation/rerere-config.txt new file mode 100644 index 0000000000..40abdf6a6b --- /dev/null +++ b/Documentation/rerere-config.txt @@ -0,0 +1,12 @@ +rerere.autoUpdate:: + When set to true, `git-rerere` updates the index with the + resulting contents after it cleanly resolves conflicts using + previously recorded resolution. Defaults to false. + +rerere.enabled:: + Activate recording of resolved conflicts, so that identical + conflict hunks can be resolved automatically, should they be + encountered again. By default, linkgit:git-rerere[1] is + enabled if there is an `rr-cache` directory under the + `$GIT_DIR`, e.g. if "rerere" was previously used in the + repository. From patchwork Sat Oct 20 12:38:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650497 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 361D414E2 for ; Sat, 20 Oct 2018 12:40:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1FC732861D for ; Sat, 20 Oct 2018 12:40:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1466A28620; Sat, 20 Oct 2018 12:40:20 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 B4BF12861D for ; Sat, 20 Oct 2018 12:40:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727734AbeJTUug (ORCPT ); Sat, 20 Oct 2018 16:50:36 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:43449 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727720AbeJTUuf (ORCPT ); Sat, 20 Oct 2018 16:50:35 -0400 Received: by mail-lj1-f196.google.com with SMTP id r8-v6so33087504ljc.10 for ; Sat, 20 Oct 2018 05:40:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tCjmKLjfA6DTboWLH4V/76LEsuVPO4ggMbG4ST3rNbA=; b=hinH8naRmRUz/nMT/NqN/VwUhiN8SlWzyRiB9NAGtqHS4ZDgDsm19gYf4DGm4/IRCV ADKds5An92KNDFO7LaIuEw4T8CbaK/OZY6fzKpl7asUMI9qxAuOVlBizNnFU7TKM4JBY w22iubsMGycS/v2PTr7WbzCNgL4JqhGbHw0/nkgbzFuEuemZl1TrWKXVtDK1C3wX5lsG 7p5NttC2IHXe4xTFoBoOj33Lvh2jmxgI41j+W/RnlHtvvjxz2Z3mfr4INdvrNfX7J2QL xdEVy61hatzCrYO7BHelL6GxbzFY5etHr60AuIv8HjTuBzxvVnp1DXYGpHOzrAxxzcw1 0/Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tCjmKLjfA6DTboWLH4V/76LEsuVPO4ggMbG4ST3rNbA=; b=Gdz0qop+dDXWxIEMfnoZhwcbo+pzgCdhjtDx5id1XT9+HnGxSpBxZQdjhd01Tm3Bo5 RXdfBr8x2fhl40KdBk+RlGFZogGvW3ttBwB4ZB0qU3RLlxr06j0nz4yQylMv+1f724Rn Md15S+JLKYXR8XvD0paoxB/WHMT76dhrXwMorzMpN77o0b+O+ghlwVRn3Aj8v2fGQstk dvqr96Pc44dt+cIJDyahJ3+HKkj3H07Kj8TZN9K4yBwPQMr7mQAK7yHA5HBaCnMYEbnL 16u6k0QX6Cz25uUqon5idxa03/6kEcmT1xI6pbY5LbzFVbU0ZHg2Wo7YskexykklrXtJ KDmw== X-Gm-Message-State: ABuFfohcBj2QwVNtDFjZ8BGKWpmVHVt53/SrgtvDwMEb5hICIX8QbgI9 6BAHTsX1Qn2QnHqaL7T7CvJWk8CE X-Google-Smtp-Source: ACcGV60R73LBpuMl4a0gTu08zO99OyVal75ii6KKOAv8q6FF2UKAYX0qpOuLad7FB3uj5se+rVxNGw== X-Received: by 2002:a2e:7109:: with SMTP id m9-v6mr24999154ljc.176.1540039212453; Sat, 20 Oct 2018 05:40:12 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.40.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:40:11 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 47/59] config.txt: move sequencer.* to a separate file Date: Sat, 20 Oct 2018 14:38:36 +0200 Message-Id: <20181020123848.2785-48-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 6 +----- Documentation/sequencer-config.txt | 5 +++++ 2 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 Documentation/sequencer-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index f42b69f3b0..e5454df2f8 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -654,11 +654,7 @@ include::rerere-config.txt[] include::sendemail-config.txt[] -sequence.editor:: - Text editor used by `git rebase -i` for editing the rebase instruction file. - The value is meant to be interpreted by the shell when it is used. - It can be overridden by the `GIT_SEQUENCE_EDITOR` environment variable. - When not configured the default commit message editor is used instead. +include::sequencer-config.txt[] showBranch.default:: The default set of branches for linkgit:git-show-branch[1]. diff --git a/Documentation/sequencer-config.txt b/Documentation/sequencer-config.txt new file mode 100644 index 0000000000..b48d532a96 --- /dev/null +++ b/Documentation/sequencer-config.txt @@ -0,0 +1,5 @@ +sequence.editor:: + Text editor used by `git rebase -i` for editing the rebase instruction file. + The value is meant to be interpreted by the shell when it is used. + It can be overridden by the `GIT_SEQUENCE_EDITOR` environment variable. + When not configured the default commit message editor is used instead. From patchwork Sat Oct 20 12:38:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650493 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 0C05014E2 for ; Sat, 20 Oct 2018 12:40:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EA6082861D for ; Sat, 20 Oct 2018 12:40:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DF28428620; Sat, 20 Oct 2018 12:40:17 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 84D4B2861D for ; Sat, 20 Oct 2018 12:40:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727738AbeJTUug (ORCPT ); Sat, 20 Oct 2018 16:50:36 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:32807 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727692AbeJTUug (ORCPT ); Sat, 20 Oct 2018 16:50:36 -0400 Received: by mail-lj1-f195.google.com with SMTP id z21-v6so33118003ljz.0 for ; Sat, 20 Oct 2018 05:40:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fVa8gG3KQx9z1I7+2T5HAnbon06rqilvzFi8WN+ki7s=; b=Kx/i90IYm/OTNqAt/LF87B2zvqCgoyDgkEZR1fOIUgmhyFKBAVo9sLACrsM3ZOr1ZB ZnkTTXg4FIyIfxOvqnSLb7ZI63i4UR+I/JKNahonXFUluSEfHBqXye6ZfhnuwiE25dyV 4+XK1CwOD+T/UPkw8RhBdJ/nySOCPwxPvjGFu7Y4fcwRM2Oudw6v1i0HfeuVXvkBFJDo xUNLOkx70HG4S3i2VIzfthAhCQ/OOZV0sIyn2J/XGZ3KbPf7wmSH6oLfeNJC/ILvH1pX sLKGLObHVsrjMFCy3ifbgDs6htkFhTpqNoHPpShoVmXyJvFk97MBU1B0XftjAKN9ACRP K8Hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fVa8gG3KQx9z1I7+2T5HAnbon06rqilvzFi8WN+ki7s=; b=PJBsxsdV243BtLdmM3PzGLBlsslBesHy8zyXt19tg75ZqjygBQRX3l7QfN+zj1cgsJ WfXfaNFTPH+gK2A0k9gIfaiTaB7rJqh7sohRflqw5DQ2djhmjCzhJbi5+8fKNWZjzo/O SK661MZF96/2O47jr5UJnhvhioc1MY5kjSzHX7ZLMf87jZPRfBtQlUEse4CAmEdlVTaP wvGOapCG998tfyiMHXjKsw8G9NbeCFWwbF/6QAy958pUffTZCmbpCUEGpCrt3M/4vpBQ 5mBE95fwXUvYGxYbGeJy4NeNLqRJo+1HSxcX0FVPg+KWMbymPo5wk5KM4K5pwxx5jqLE uqNw== X-Gm-Message-State: ABuFfoheJLJ87jtUoNPpbexKTKhM8Lgm3+AIT6r4vgdPM4TUzzREgKjK PVAjjyEpMMYeWNBHOJ2QPuw+sj9G X-Google-Smtp-Source: ACcGV636kPbGsgHommKHA4N2WQSd5Zf4gr0omgXGm4TdhMHkIYdGTrVbJqbo0JVUJ/UTbBE1Ad1SAw== X-Received: by 2002:a2e:3e0b:: with SMTP id l11-v6mr27511150lja.16.1540039213698; Sat, 20 Oct 2018 05:40:13 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.40.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:40:12 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 48/59] config.txt: move showBranch.* to a separate file Date: Sat, 20 Oct 2018 14:38:37 +0200 Message-Id: <20181020123848.2785-49-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 4 +--- Documentation/showbranch-config.txt | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 Documentation/showbranch-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index e5454df2f8..6136c5638c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -656,9 +656,7 @@ include::sendemail-config.txt[] include::sequencer-config.txt[] -showBranch.default:: - The default set of branches for linkgit:git-show-branch[1]. - See linkgit:git-show-branch[1]. +include::showbranch-config.txt[] splitIndex.maxPercentChange:: When the split index feature is used, this specifies the diff --git a/Documentation/showbranch-config.txt b/Documentation/showbranch-config.txt new file mode 100644 index 0000000000..e79ecd9ee9 --- /dev/null +++ b/Documentation/showbranch-config.txt @@ -0,0 +1,3 @@ +showBranch.default:: + The default set of branches for linkgit:git-show-branch[1]. + See linkgit:git-show-branch[1]. From patchwork Sat Oct 20 12:38:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650495 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 0395614E2 for ; Sat, 20 Oct 2018 12:40:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E05F32861D for ; Sat, 20 Oct 2018 12:40:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D48C328620; Sat, 20 Oct 2018 12:40:18 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 723052861D for ; Sat, 20 Oct 2018 12:40:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727743AbeJTUuh (ORCPT ); Sat, 20 Oct 2018 16:50:37 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:36898 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727729AbeJTUuh (ORCPT ); Sat, 20 Oct 2018 16:50:37 -0400 Received: by mail-lj1-f196.google.com with SMTP id 63-v6so33123096ljs.4 for ; Sat, 20 Oct 2018 05:40:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=A+fZ2W1DKO1AQPA9KQk4WC+0KJbobMi+X7yIJnxUiZQ=; b=KI9pxyuGborZZgUYOui+ADqiGX7z2GFy1XIXB5Fd/wf4vhUUuXrSjaB9LncyabF+SK VVIe/XjeKv1VifDainIojlq7yffgE5MKjeIPy7nnx65LGpxcPWddbR9FyHHVBRA7ELDw SS30s5dz2+QAJMuKMUgQV7P0fLfx1zgKHWe9CiXHRGx9kKx4Oa3OCQRqs3JADh4wjr7c ou5nfI/dsXy+7UanHlgBQNKYx7qbSG7vC1ExiPxdrOWy/auDQTepayiF+iJeByMj5Qcy STZJ+xj2cV82DAG+xUdbzk1Nf/vV0nKRK74vVeEuRj090H+Sl37lA9uZ2r53YmJdWNnd TJAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=A+fZ2W1DKO1AQPA9KQk4WC+0KJbobMi+X7yIJnxUiZQ=; b=PVtmmdZ/59xUKlcjWEPlk6p2BWpjULlCoGOTUQ1QSBHTlEoczH5kSkd6Uo3mNV1MKZ XJKODWYDEBoxvkeUVME/P3YbcgkxLB22CF541pXCOzisk8S+M5PU4qNJPe+v+ssUQ45s VbYLt011Z2PZRl/XJ/hs8c6kfWeRRGoyPa3PYVHJDI0xMyo0kXlkequ2u92Y16rtsBpR z0NubwuiXAKGZdMdS50ioZtg5Mgvu9vZRWitr8aMGmt29ezfevOvNDNf3ech6dWRYGqZ t+40gKtKxDD9KsGEXZuvU/1Ttf1c03JwNRsKDt28T6yg/IAYmXMB4syhd45/zs2dEoxu HxHA== X-Gm-Message-State: ABuFfohgHw2me6tPZi8Nai3ilyPlPUs8BAV/A5WBTYBR9EOQBQQxzMnQ MeYs507CMTxVt+gUiQ8hSD5Qe/3o X-Google-Smtp-Source: ACcGV603lZqM+O8xR1RfLGndz98KgSGaIOcciPn9XNaYcQioAP3tdLYALZ6sGxI63AyEaqMHHhrwDg== X-Received: by 2002:a2e:9b8a:: with SMTP id z10-v6mr8637883lji.55.1540039214621; Sat, 20 Oct 2018 05:40:14 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.40.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:40:14 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 49/59] config.txt: move splitIndex.* to a separate file Date: Sat, 20 Oct 2018 14:38:38 +0200 Message-Id: <20181020123848.2785-50-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 25 +------------------------ Documentation/splitindex-config.txt | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 24 deletions(-) create mode 100644 Documentation/splitindex-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 6136c5638c..2330acd840 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -658,30 +658,7 @@ include::sequencer-config.txt[] include::showbranch-config.txt[] -splitIndex.maxPercentChange:: - When the split index feature is used, this specifies the - percent of entries the split index can contain compared to the - total number of entries in both the split index and the shared - index before a new shared index is written. - The value should be between 0 and 100. If the value is 0 then - a new shared index is always written, if it is 100 a new - shared index is never written. - By default the value is 20, so a new shared index is written - if the number of entries in the split index would be greater - than 20 percent of the total number of entries. - See linkgit:git-update-index[1]. - -splitIndex.sharedIndexExpire:: - When the split index feature is used, shared index files that - were not modified since the time this variable specifies will - be removed when a new shared index file is created. The value - "now" expires all entries immediately, and "never" suppresses - expiration altogether. - The default value is "2.weeks.ago". - Note that a shared index file is considered modified (for the - purpose of expiration) each time a new split-index file is - either created based on it or read from it. - See linkgit:git-update-index[1]. +include::splitindex-config.txt[] include::ssh-config.txt[] diff --git a/Documentation/splitindex-config.txt b/Documentation/splitindex-config.txt new file mode 100644 index 0000000000..afdb186df8 --- /dev/null +++ b/Documentation/splitindex-config.txt @@ -0,0 +1,24 @@ +splitIndex.maxPercentChange:: + When the split index feature is used, this specifies the + percent of entries the split index can contain compared to the + total number of entries in both the split index and the shared + index before a new shared index is written. + The value should be between 0 and 100. If the value is 0 then + a new shared index is always written, if it is 100 a new + shared index is never written. + By default the value is 20, so a new shared index is written + if the number of entries in the split index would be greater + than 20 percent of the total number of entries. + See linkgit:git-update-index[1]. + +splitIndex.sharedIndexExpire:: + When the split index feature is used, shared index files that + were not modified since the time this variable specifies will + be removed when a new shared index file is created. The value + "now" expires all entries immediately, and "never" suppresses + expiration altogether. + The default value is "2.weeks.ago". + Note that a shared index file is considered modified (for the + purpose of expiration) each time a new split-index file is + either created based on it or read from it. + See linkgit:git-update-index[1]. From patchwork Sat Oct 20 12:38:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650501 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 0BE9114E2 for ; Sat, 20 Oct 2018 12:40:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E929A2861D for ; Sat, 20 Oct 2018 12:40:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DDC5D28620; Sat, 20 Oct 2018 12:40:21 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 3E83C2861D for ; Sat, 20 Oct 2018 12:40:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727745AbeJTUuj (ORCPT ); Sat, 20 Oct 2018 16:50:39 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:44853 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727692AbeJTUui (ORCPT ); Sat, 20 Oct 2018 16:50:38 -0400 Received: by mail-lj1-f193.google.com with SMTP id v6-v6so33059517ljc.11 for ; Sat, 20 Oct 2018 05:40:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=L6yfg0IOKx2TlE/F91oWyM5GVprPRb0Y+K4Y/vv0KqY=; b=t9LDgIE9FLAMyNtyH4+SGwpQXBiQfO/Q0pNsH9QCprwb9vGInN8ATDZhi9d4U6M4SL jvtyFHEDnafAWRfr+N4xyMEllbU/jaczpIB9+yDFwq7tEADmt/nvIDcThX+gqF6mjIPK rdab7h0CgI0YLBGRyNFuTBuXCi6EwotyGNErHvEiyer0Ilqad9k4GF4iotakfTFyEwMQ EHm+tr6EBomWgB3RT6arlNptY5Vpm1lHwwOVKQYYKiSCF7UN6QrCYBSIcQHktS7gNFL3 D4buuxAOJqJRU2/S81NK1mHqhoYxNCgc+Kx3fTEC+FC4vnmt29ZM14oqCQ306Rz57vDo RUsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=L6yfg0IOKx2TlE/F91oWyM5GVprPRb0Y+K4Y/vv0KqY=; b=bS86Iwx2dBTq+PBetmKD31PD7qnZmvmommwiEzl/Zwx4u3IJPX16jvpLkQJghqcslA +Zolh01ojt4YrDnv+EfkqELWm1lIjfcXAfAxPwxkWQJpN3MZW5KZ1PLppSqwyxpTatI8 s4lRcFIv2wRFJCktn/lZYEXL/n/87zJ9vRTBASwVtUMnkhjHVsNw5cwvMN/2mWDd1dnD /K5AeP/vl/c9RMeYy5V2p9a6+wwzgcKpm4WSfDd0qLmPecP/nFQ5UKMMT6GuAjjycuaI G8+yj+cun6VCFqh97LctYyjU06Yu/FxC/ltMBc/no9241qyD1wrTo0W9+tqDYes+zvtK qIuA== X-Gm-Message-State: ABuFfoj1RsQ/TfNFsTzCAWGs+TL3dd6RzbDDIccmDO6nKMJrzzy8YpLX MJhSm2zeljIAY6iA2TKR+BbZH/yZ X-Google-Smtp-Source: ACcGV63W7MqlXV/nx/ROvIcfqB74jApGfmtr9uTZzyn689+vt+rbgmQ1SDC2DfAmL+7txyvi3MWvuw== X-Received: by 2002:a2e:92ca:: with SMTP id k10-v6mr25191029ljh.103.1540039215605; Sat, 20 Oct 2018 05:40:15 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.40.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:40:14 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 50/59] config.txt: move status.* to a separate file Date: Sat, 20 Oct 2018 14:38:39 +0200 Message-Id: <20181020123848.2785-51-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 73 +-------------------------------- Documentation/status-config.txt | 72 ++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 72 deletions(-) create mode 100644 Documentation/status-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 2330acd840..b7df6a8311 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -662,78 +662,7 @@ include::splitindex-config.txt[] include::ssh-config.txt[] -status.relativePaths:: - By default, linkgit:git-status[1] shows paths relative to the - current directory. Setting this variable to `false` shows paths - relative to the repository root (this was the default for Git - prior to v1.5.4). - -status.short:: - Set to true to enable --short by default in linkgit:git-status[1]. - The option --no-short takes precedence over this variable. - -status.branch:: - Set to true to enable --branch by default in linkgit:git-status[1]. - The option --no-branch takes precedence over this variable. - -status.displayCommentPrefix:: - If set to true, linkgit:git-status[1] will insert a comment - prefix before each output line (starting with - `core.commentChar`, i.e. `#` by default). This was the - behavior of linkgit:git-status[1] in Git 1.8.4 and previous. - Defaults to false. - -status.renameLimit:: - The number of files to consider when performing rename detection - in linkgit:git-status[1] and linkgit:git-commit[1]. Defaults to - the value of diff.renameLimit. - -status.renames:: - Whether and how Git detects renames in linkgit:git-status[1] and - linkgit:git-commit[1] . If set to "false", rename detection is - disabled. If set to "true", basic rename detection is enabled. - If set to "copies" or "copy", Git will detect copies, as well. - Defaults to the value of diff.renames. - -status.showStash:: - If set to true, linkgit:git-status[1] will display the number of - entries currently stashed away. - Defaults to false. - -status.showUntrackedFiles:: - By default, linkgit:git-status[1] and linkgit:git-commit[1] show - files which are not currently tracked by Git. Directories which - contain only untracked files, are shown with the directory name - only. Showing untracked files means that Git needs to lstat() all - the files in the whole repository, which might be slow on some - systems. So, this variable controls how the commands displays - the untracked files. Possible values are: -+ --- -* `no` - Show no untracked files. -* `normal` - Show untracked files and directories. -* `all` - Show also individual files in untracked directories. --- -+ -If this variable is not specified, it defaults to 'normal'. -This variable can be overridden with the -u|--untracked-files option -of linkgit:git-status[1] and linkgit:git-commit[1]. - -status.submoduleSummary:: - Defaults to false. - If this is set to a non zero number or true (identical to -1 or an - unlimited number), the submodule summary will be enabled and a - summary of commits for modified submodules will be shown (see - --summary-limit option of linkgit:git-submodule[1]). Please note - that the summary output command will be suppressed for all - submodules when `diff.ignoreSubmodules` is set to 'all' or only - for those submodules where `submodule..ignore=all`. The only - exception to that rule is that status and commit will show staged - submodule changes. To - also view the summary for ignored submodules you can either use - the --ignore-submodules=dirty command-line option or the 'git - submodule summary' command, which shows a similar output but does - not honor these settings. +include::status-config.txt[] stash.showPatch:: If this is set to true, the `git stash show` command without an diff --git a/Documentation/status-config.txt b/Documentation/status-config.txt new file mode 100644 index 0000000000..ed72fa7dae --- /dev/null +++ b/Documentation/status-config.txt @@ -0,0 +1,72 @@ +status.relativePaths:: + By default, linkgit:git-status[1] shows paths relative to the + current directory. Setting this variable to `false` shows paths + relative to the repository root (this was the default for Git + prior to v1.5.4). + +status.short:: + Set to true to enable --short by default in linkgit:git-status[1]. + The option --no-short takes precedence over this variable. + +status.branch:: + Set to true to enable --branch by default in linkgit:git-status[1]. + The option --no-branch takes precedence over this variable. + +status.displayCommentPrefix:: + If set to true, linkgit:git-status[1] will insert a comment + prefix before each output line (starting with + `core.commentChar`, i.e. `#` by default). This was the + behavior of linkgit:git-status[1] in Git 1.8.4 and previous. + Defaults to false. + +status.renameLimit:: + The number of files to consider when performing rename detection + in linkgit:git-status[1] and linkgit:git-commit[1]. Defaults to + the value of diff.renameLimit. + +status.renames:: + Whether and how Git detects renames in linkgit:git-status[1] and + linkgit:git-commit[1] . If set to "false", rename detection is + disabled. If set to "true", basic rename detection is enabled. + If set to "copies" or "copy", Git will detect copies, as well. + Defaults to the value of diff.renames. + +status.showStash:: + If set to true, linkgit:git-status[1] will display the number of + entries currently stashed away. + Defaults to false. + +status.showUntrackedFiles:: + By default, linkgit:git-status[1] and linkgit:git-commit[1] show + files which are not currently tracked by Git. Directories which + contain only untracked files, are shown with the directory name + only. Showing untracked files means that Git needs to lstat() all + the files in the whole repository, which might be slow on some + systems. So, this variable controls how the commands displays + the untracked files. Possible values are: ++ +-- +* `no` - Show no untracked files. +* `normal` - Show untracked files and directories. +* `all` - Show also individual files in untracked directories. +-- ++ +If this variable is not specified, it defaults to 'normal'. +This variable can be overridden with the -u|--untracked-files option +of linkgit:git-status[1] and linkgit:git-commit[1]. + +status.submoduleSummary:: + Defaults to false. + If this is set to a non zero number or true (identical to -1 or an + unlimited number), the submodule summary will be enabled and a + summary of commits for modified submodules will be shown (see + --summary-limit option of linkgit:git-submodule[1]). Please note + that the summary output command will be suppressed for all + submodules when `diff.ignoreSubmodules` is set to 'all' or only + for those submodules where `submodule..ignore=all`. The only + exception to that rule is that status and commit will show staged + submodule changes. To + also view the summary for ignored submodules you can either use + the --ignore-submodules=dirty command-line option or the 'git + submodule summary' command, which shows a similar output but does + not honor these settings. From patchwork Sat Oct 20 12:38:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650499 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 0DEE31508 for ; Sat, 20 Oct 2018 12:40:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EC93F2861D for ; Sat, 20 Oct 2018 12:40:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E12EB28620; Sat, 20 Oct 2018 12:40:20 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 7B4A32861D for ; Sat, 20 Oct 2018 12:40:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727749AbeJTUuj (ORCPT ); Sat, 20 Oct 2018 16:50:39 -0400 Received: from mail-lf1-f66.google.com ([209.85.167.66]:40501 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727739AbeJTUui (ORCPT ); Sat, 20 Oct 2018 16:50:38 -0400 Received: by mail-lf1-f66.google.com with SMTP id n3-v6so278110lfe.7 for ; Sat, 20 Oct 2018 05:40:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bIMUPUoh8DyRuLrx2Q/kyBgIDRfpOXBG8JNstQ/OqFQ=; b=Hk7UY27v5uhldZ9+ICEBgtti+K64Ic3wrFAvg9aFw+VyKxOssRT/Rumvd0Djmv/yKe 9YKju52Mg9SkgfoUuOBkhCm/3tVdD+Pf9mWaLH3nEhdMHr2EmT8iZEWTZeqrCn1hK2Zo mAz6rPzo21NrKOpKStEBbh8U1LlnVy9LA20vY/25g4IY0cz8Gb+P/DxoEkJD8olDP1ZI HsjY58Hv0v0KtpPLY1Ym+ePSrorZyOcM8+5nLNVvv8yV81oEMvOk5sa5t+3J8mxavrb9 JpJb//6uCJN7FmB1bArX6m2MJZ0E8B/xt/Ht8M2mwFU+Rw0llSQM3R7yAgyMhir4yyOW Z/4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bIMUPUoh8DyRuLrx2Q/kyBgIDRfpOXBG8JNstQ/OqFQ=; b=WpFbaqU3IJfjM3GWm4Kbb7/VcVZO7WIxoX201p/dgAUR2tgPGBvTgcFVW09kiEXVxV 3pqus4IAk21fagNw4lQGSuYYtGeC7VqIofaaT0+H8zEUENqCLewn70f8A7z2I0v5QO67 yiLVtvVh+yB8h1ALssPKAmJz3KiElaljgvPZRfNO6uEEnkkDu15/23OJ4dlUDWqnb9yH S/5pM1GLZuqLnJ2I2/1nN1VwUlDk7A97M3ef6ZbVltCaFAaEugALRo+1eOolojuO2Ld2 bA1GDEKHPn/8J/7IxdXn8Vf7VcN71CKlj99hq0QMTwNAdjhR17nPJNGwalWmC3CQhOhq TlCg== X-Gm-Message-State: ABuFfoi/pVyLWXk6mE6/W0K3jYRbDykkfN+mhQb+Pjgixtw0sDjzSaCQ vL7NnfladDCsZBFCTYdUuJDoGzi0 X-Google-Smtp-Source: ACcGV62taIeKthXKP5oDoiQ64fr4XcZR/VFuMtZxRDPgEnZcWTs3Ni+gvEBjTX2rvdQ5sNtQr1d5FQ== X-Received: by 2002:a19:945b:: with SMTP id w88mr5224741lfd.15.1540039216629; Sat, 20 Oct 2018 05:40:16 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.40.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:40:15 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 51/59] config.txt: move tag.* to a separate file Date: Sat, 20 Oct 2018 14:38:40 +0200 Message-Id: <20181020123848.2785-52-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 27 ++------------------------- Documentation/stash-config.txt | 9 +++++++++ Documentation/tag-config.txt | 16 ++++++++++++++++ 3 files changed, 27 insertions(+), 25 deletions(-) create mode 100644 Documentation/stash-config.txt create mode 100644 Documentation/tag-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index b7df6a8311..4b1efe0a95 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -664,34 +664,11 @@ include::ssh-config.txt[] include::status-config.txt[] -stash.showPatch:: - If this is set to true, the `git stash show` command without an - option will show the stash entry in patch form. Defaults to false. - See description of 'show' command in linkgit:git-stash[1]. - -stash.showStat:: - If this is set to true, the `git stash show` command without an - option will show diffstat of the stash entry. Defaults to true. - See description of 'show' command in linkgit:git-stash[1]. +include::stash-config.txt[] include::submodule-config.txt[] -tag.forceSignAnnotated:: - A boolean to specify whether annotated tags created should be GPG signed. - If `--annotate` is specified on the command line, it takes - precedence over this option. - -tag.sort:: - This variable controls the sort ordering of tags when displayed by - linkgit:git-tag[1]. Without the "--sort=" option provided, the - value of this variable will be used as the default. - -tar.umask:: - This variable can be used to restrict the permission bits of - tar archive entries. The default is 0002, which turns off the - world write bit. The special value "user" indicates that the - archiving user's umask will be used instead. See umask(2) and - linkgit:git-archive[1]. +include::tag-config.txt[] transfer.fsckObjects:: When `fetch.fsckObjects` or `receive.fsckObjects` are diff --git a/Documentation/stash-config.txt b/Documentation/stash-config.txt new file mode 100644 index 0000000000..c583d46d6b --- /dev/null +++ b/Documentation/stash-config.txt @@ -0,0 +1,9 @@ +stash.showPatch:: + If this is set to true, the `git stash show` command without an + option will show the stash entry in patch form. Defaults to false. + See description of 'show' command in linkgit:git-stash[1]. + +stash.showStat:: + If this is set to true, the `git stash show` command without an + option will show diffstat of the stash entry. Defaults to true. + See description of 'show' command in linkgit:git-stash[1]. diff --git a/Documentation/tag-config.txt b/Documentation/tag-config.txt new file mode 100644 index 0000000000..663663bdec --- /dev/null +++ b/Documentation/tag-config.txt @@ -0,0 +1,16 @@ +tag.forceSignAnnotated:: + A boolean to specify whether annotated tags created should be GPG signed. + If `--annotate` is specified on the command line, it takes + precedence over this option. + +tag.sort:: + This variable controls the sort ordering of tags when displayed by + linkgit:git-tag[1]. Without the "--sort=" option provided, the + value of this variable will be used as the default. + +tar.umask:: + This variable can be used to restrict the permission bits of + tar archive entries. The default is 0002, which turns off the + world write bit. The special value "user" indicates that the + archiving user's umask will be used instead. See umask(2) and + linkgit:git-archive[1]. From patchwork Sat Oct 20 12:38:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650503 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 3CE8814E2 for ; Sat, 20 Oct 2018 12:40:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 269CC2861D for ; Sat, 20 Oct 2018 12:40:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1B42128620; Sat, 20 Oct 2018 12:40: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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 649DB2861D for ; Sat, 20 Oct 2018 12:40:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727760AbeJTUun (ORCPT ); Sat, 20 Oct 2018 16:50:43 -0400 Received: from mail-lf1-f67.google.com ([209.85.167.67]:45199 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727739AbeJTUum (ORCPT ); Sat, 20 Oct 2018 16:50:42 -0400 Received: by mail-lf1-f67.google.com with SMTP id c24-v6so677774lfi.12 for ; Sat, 20 Oct 2018 05:40:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QMpf33Ze85jdunoqvnfP23yuilcns2txI9+qcU4C0mI=; b=kFBkwePTqYOfInCLlpPSac4vdIWUiFy5EEYM5MeIFnP++Hp0Lzdp5RQyrrqJUDQ54H VJIUog8rs62Xlsq9Fi8jTlvnl76UgNLZvbOcBg8pQ3C/rUfOMkZGQTsNg1gDSO/llA4I vihpimLMb/GVr4D8DDZjDMWPQlpqNtBm+hE127S09VpFcciBCjALX/51DLLiT0XcPdz4 wCw08tLR6bj25ZWBhTTpcKk3T7YNjfnOg+NpxsN5MMwxdLCxB8rAB36s28dqTTMEolgX 24GiaP7TPvb5zY9YwHiJXcncq7V7RzLlnrOsTsIyPtZyoAo7/UsO6pgAFeYboGKdoC6a UcAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QMpf33Ze85jdunoqvnfP23yuilcns2txI9+qcU4C0mI=; b=az8LRgE2R16PiRCdU421Cy62BogHTVkw1kzkLBKIV5NuDfr3YF1w9CnzK7jnEUV+jJ vYxjfwe4OHKceyBzO3iAxYolYNfXxYkX9IAMQ7Ne9TDM0KbSdY7+doOBruIJo6C6y5DL Pd/MlC76nM5n9Dz0jcqF/uuelocQ1Hzc9TfieNdYAseM3Da5f53WLKT/eUp82snkLyru xqM5qS9c1tGcIOwcNIdjLue1ybfgdf9RbYj5Ksx4pcRvGkhGNWHEEFPmq5EZy5tNSGmZ 4g52wMjMT/HM7QZhl4shrTqs45lzPRxHp2f3ndTw+HKFNzGkejnr8ZoMuU7X/PnWm2Jr Y+5g== X-Gm-Message-State: ABuFfogtkaBd4WdpNlA+XC2Qr/ttKAa4eDtF1tniFJM4Arwiy6D+RSwU SAF6c0MiL0kAEEPDRwWDxmBaFTFD X-Google-Smtp-Source: ACcGV60MrkHjYOa0dHy6K/buDqdbt8q1Fcl2yJxZiqO7i9GiqXD6wG2Cs1DboSDxijimLd3cw7TUTA== X-Received: by 2002:a19:4411:: with SMTP id r17-v6mr5805725lfa.87.1540039219036; Sat, 20 Oct 2018 05:40:19 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.40.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:40:18 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 52/59] config.txt: move transfer.* to a separate file Date: Sat, 20 Oct 2018 14:38:41 +0200 Message-Id: <20181020123848.2785-53-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 72 +------------------------------ Documentation/transfer-config.txt | 71 ++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 71 deletions(-) create mode 100644 Documentation/transfer-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 4b1efe0a95..b70f98baba 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -670,77 +670,7 @@ include::submodule-config.txt[] include::tag-config.txt[] -transfer.fsckObjects:: - When `fetch.fsckObjects` or `receive.fsckObjects` are - not set, the value of this variable is used instead. - Defaults to false. -+ -When set, the fetch or receive will abort in the case of a malformed -object or a link to a nonexistent object. In addition, various other -issues are checked for, including legacy issues (see `fsck.`), -and potential security issues like the existence of a `.GIT` directory -or a malicious `.gitmodules` file (see the release notes for v2.2.1 -and v2.17.1 for details). Other sanity and security checks may be -added in future releases. -+ -On the receiving side, failing fsckObjects will make those objects -unreachable, see "QUARANTINE ENVIRONMENT" in -linkgit:git-receive-pack[1]. On the fetch side, malformed objects will -instead be left unreferenced in the repository. -+ -Due to the non-quarantine nature of the `fetch.fsckObjects` -implementation it can not be relied upon to leave the object store -clean like `receive.fsckObjects` can. -+ -As objects are unpacked they're written to the object store, so there -can be cases where malicious objects get introduced even though the -"fetch" failed, only to have a subsequent "fetch" succeed because only -new incoming objects are checked, not those that have already been -written to the object store. That difference in behavior should not be -relied upon. In the future, such objects may be quarantined for -"fetch" as well. -+ -For now, the paranoid need to find some way to emulate the quarantine -environment if they'd like the same protection as "push". E.g. in the -case of an internal mirror do the mirroring in two steps, one to fetch -the untrusted objects, and then do a second "push" (which will use the -quarantine) to another internal repo, and have internal clients -consume this pushed-to repository, or embargo internal fetches and -only allow them once a full "fsck" has run (and no new fetches have -happened in the meantime). - -transfer.hideRefs:: - String(s) `receive-pack` and `upload-pack` use to decide which - refs to omit from their initial advertisements. Use more than - one definition to specify multiple prefix strings. A ref that is - under the hierarchies listed in the value of this variable is - excluded, and is hidden when responding to `git push` or `git - fetch`. See `receive.hideRefs` and `uploadpack.hideRefs` for - program-specific versions of this config. -+ -You may also include a `!` in front of the ref name to negate the entry, -explicitly exposing it, even if an earlier entry marked it as hidden. -If you have multiple hideRefs values, later entries override earlier ones -(and entries in more-specific config files override less-specific ones). -+ -If a namespace is in use, the namespace prefix is stripped from each -reference before it is matched against `transfer.hiderefs` patterns. -For example, if `refs/heads/master` is specified in `transfer.hideRefs` and -the current namespace is `foo`, then `refs/namespaces/foo/refs/heads/master` -is omitted from the advertisements but `refs/heads/master` and -`refs/namespaces/bar/refs/heads/master` are still advertised as so-called -"have" lines. In order to match refs before stripping, add a `^` in front of -the ref name. If you combine `!` and `^`, `!` must be specified first. -+ -Even if you hide refs, a client may still be able to steal the target -objects via the techniques described in the "SECURITY" section of the -linkgit:gitnamespaces[7] man page; it's best to keep private data in a -separate repository. - -transfer.unpackLimit:: - When `fetch.unpackLimit` or `receive.unpackLimit` are - not set, the value of this variable is used instead. - The default value is 100. +include::transfer-config.txt[] uploadarchive.allowUnreachable:: If true, allow clients to use `git archive --remote` to request diff --git a/Documentation/transfer-config.txt b/Documentation/transfer-config.txt new file mode 100644 index 0000000000..4a5dfe2fc1 --- /dev/null +++ b/Documentation/transfer-config.txt @@ -0,0 +1,71 @@ +transfer.fsckObjects:: + When `fetch.fsckObjects` or `receive.fsckObjects` are + not set, the value of this variable is used instead. + Defaults to false. ++ +When set, the fetch or receive will abort in the case of a malformed +object or a link to a nonexistent object. In addition, various other +issues are checked for, including legacy issues (see `fsck.`), +and potential security issues like the existence of a `.GIT` directory +or a malicious `.gitmodules` file (see the release notes for v2.2.1 +and v2.17.1 for details). Other sanity and security checks may be +added in future releases. ++ +On the receiving side, failing fsckObjects will make those objects +unreachable, see "QUARANTINE ENVIRONMENT" in +linkgit:git-receive-pack[1]. On the fetch side, malformed objects will +instead be left unreferenced in the repository. ++ +Due to the non-quarantine nature of the `fetch.fsckObjects` +implementation it can not be relied upon to leave the object store +clean like `receive.fsckObjects` can. ++ +As objects are unpacked they're written to the object store, so there +can be cases where malicious objects get introduced even though the +"fetch" failed, only to have a subsequent "fetch" succeed because only +new incoming objects are checked, not those that have already been +written to the object store. That difference in behavior should not be +relied upon. In the future, such objects may be quarantined for +"fetch" as well. ++ +For now, the paranoid need to find some way to emulate the quarantine +environment if they'd like the same protection as "push". E.g. in the +case of an internal mirror do the mirroring in two steps, one to fetch +the untrusted objects, and then do a second "push" (which will use the +quarantine) to another internal repo, and have internal clients +consume this pushed-to repository, or embargo internal fetches and +only allow them once a full "fsck" has run (and no new fetches have +happened in the meantime). + +transfer.hideRefs:: + String(s) `receive-pack` and `upload-pack` use to decide which + refs to omit from their initial advertisements. Use more than + one definition to specify multiple prefix strings. A ref that is + under the hierarchies listed in the value of this variable is + excluded, and is hidden when responding to `git push` or `git + fetch`. See `receive.hideRefs` and `uploadpack.hideRefs` for + program-specific versions of this config. ++ +You may also include a `!` in front of the ref name to negate the entry, +explicitly exposing it, even if an earlier entry marked it as hidden. +If you have multiple hideRefs values, later entries override earlier ones +(and entries in more-specific config files override less-specific ones). ++ +If a namespace is in use, the namespace prefix is stripped from each +reference before it is matched against `transfer.hiderefs` patterns. +For example, if `refs/heads/master` is specified in `transfer.hideRefs` and +the current namespace is `foo`, then `refs/namespaces/foo/refs/heads/master` +is omitted from the advertisements but `refs/heads/master` and +`refs/namespaces/bar/refs/heads/master` are still advertised as so-called +"have" lines. In order to match refs before stripping, add a `^` in front of +the ref name. If you combine `!` and `^`, `!` must be specified first. ++ +Even if you hide refs, a client may still be able to steal the target +objects via the techniques described in the "SECURITY" section of the +linkgit:gitnamespaces[7] man page; it's best to keep private data in a +separate repository. + +transfer.unpackLimit:: + When `fetch.unpackLimit` or `receive.unpackLimit` are + not set, the value of this variable is used instead. + The default value is 100. From patchwork Sat Oct 20 12:38:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650505 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 BB6783CF1 for ; Sat, 20 Oct 2018 12:40:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A542E2861D for ; Sat, 20 Oct 2018 12:40:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 99E7228620; Sat, 20 Oct 2018 12:40: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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 3B7DC2861E for ; Sat, 20 Oct 2018 12:40:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727757AbeJTUun (ORCPT ); Sat, 20 Oct 2018 16:50:43 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:32812 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727751AbeJTUum (ORCPT ); Sat, 20 Oct 2018 16:50:42 -0400 Received: by mail-lj1-f195.google.com with SMTP id z21-v6so33118138ljz.0 for ; Sat, 20 Oct 2018 05:40:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=y/lwHikZ+nH5MpHfC5+Fy6uGOCl5tZ1Z/P3F6xiFTUo=; b=FQvBEuFNAexyphOXG+kcoVF5nxdH5bqEX6X50wAkKPigFFr7d7eB+yK1FsmwJLkFPp heUz1tvp6mmwjAsY48MMGVfZ3soWpPp/v2Rh3iBl7+4msFOZ2iaP1s0LfLhqSwzoMSaB 0Mrh3tTwECWNP4Rzqd9019Y52nFfbO/h0S4hTGtYO1pBlLglz3eE9xzOMfSz+r7lduOZ InBa3seXtUsd664CoEs7HiMkdl2V3AyfWAzFktcwu/i0EmslLoaXwxolIk/oorMY8yMN hmcr8JFLX9ijhBfDGThJJX4BkslVRiOWd8oUXrFBh356Fginjt1pc8JdnB9ifJZ8l/9B vclg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=y/lwHikZ+nH5MpHfC5+Fy6uGOCl5tZ1Z/P3F6xiFTUo=; b=FIL8jSi4quBgg6JIDt7beBe41dxCCGlYrx6aKr42SVB46IuyE9520hXEb8oAgqz28U 3nYlRrxgD6nVb41DbW6Mzrh84J9CCNAKpvRz9jnJukELRDhTN7fHMnNS91GcIzYL1Rlr 6SqPE45MoIJYXE9T9dYJu/iBKsqe68kAb/2grZqvOQh78ysTGO4z/6YAO7UsBYQNPD23 go4myJ3kUdeNUGmW1Qe/UzqgJSlS1qQSyuwRl2mpwcZLnURa23JdqPNMyDhRuWkDRc9f V5LxYhg0A7rAJoT51RwboLhzJtPqpENBCkfG92LvcBdtiGt0fWyshYKwXbY9bqQsOevs g1CA== X-Gm-Message-State: ABuFfoi9AXKlaYWxXo9A3DRWCCDM+n9dUPRd+pZs0F07aaonjGz/f8yB q/vgi7RoBaSnekk844Xd8Y0dNK8p X-Google-Smtp-Source: ACcGV62TNC/2RdM1Pe+z4NPzz+e74wrxWGXAbwEatcLiYC6HZEy79pzHycNOcFHHa8on3MWYMCK97A== X-Received: by 2002:a2e:7608:: with SMTP id r8-v6mr24559619ljc.175.1540039220019; Sat, 20 Oct 2018 05:40:20 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.40.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:40:19 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 53/59] config.txt: move uploadarchive.* to a separate file Date: Sat, 20 Oct 2018 14:38:42 +0200 Message-Id: <20181020123848.2785-54-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 7 +------ Documentation/uploadarchive-config.txt | 6 ++++++ 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 Documentation/uploadarchive-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index b70f98baba..fef310d47d 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -672,12 +672,7 @@ include::tag-config.txt[] include::transfer-config.txt[] -uploadarchive.allowUnreachable:: - If true, allow clients to use `git archive --remote` to request - any tree, whether reachable from the ref tips or not. See the - discussion in the "SECURITY" section of - linkgit:git-upload-archive[1] for more details. Defaults to - `false`. +include::uploadarchive-config.txt[] uploadpack.hideRefs:: This variable is the same as `transfer.hideRefs`, but applies diff --git a/Documentation/uploadarchive-config.txt b/Documentation/uploadarchive-config.txt new file mode 100644 index 0000000000..e0698e8c1d --- /dev/null +++ b/Documentation/uploadarchive-config.txt @@ -0,0 +1,6 @@ +uploadarchive.allowUnreachable:: + If true, allow clients to use `git archive --remote` to request + any tree, whether reachable from the ref tips or not. See the + discussion in the "SECURITY" section of + linkgit:git-upload-archive[1] for more details. Defaults to + `false`. From patchwork Sat Oct 20 12:38:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650509 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 59B0114E2 for ; Sat, 20 Oct 2018 12:40:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 415AF2861D for ; Sat, 20 Oct 2018 12:40:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 35DEC28623; Sat, 20 Oct 2018 12:40:29 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 8D3DB2861D for ; Sat, 20 Oct 2018 12:40:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727770AbeJTUuq (ORCPT ); Sat, 20 Oct 2018 16:50:46 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:39264 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727739AbeJTUuq (ORCPT ); Sat, 20 Oct 2018 16:50:46 -0400 Received: by mail-lj1-f195.google.com with SMTP id p1-v6so33095054ljg.6 for ; Sat, 20 Oct 2018 05:40:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZCDwu0Jd3Ls19torW3N88tVwTwWbxE+Pm9onZ4jlDi4=; b=Z7mhZZs9Osbah7dtqxchRQ8WjrT7kBtopfWZMBPxwTgscZZsfYKi9YzT6+plnYHhT/ jAAFnNRghkNWPS4j3DL7oKzwp41wwBoRG8pgar+Ik52qqYb12gjcq6w2fBaAZAkDwG8s g7j3hLiai7GO/MRcdJGsUZWPgO8RUvrR+O/xfNuHvrEoJJzOhMzbW84HLTKFVBiNbZ/Q IbzjyLetCZPonBy1QrUVLJPBAR7EDqW2lzdbgv0NtVnth4MMpGv7hF5Rp2/pBi77/en2 djGdO0UZGjRhhhj7OSXl9afecySwguY5bgM7n9JrNzD/ytipHtb1bJAQqMRGK/5pHeuk X/wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZCDwu0Jd3Ls19torW3N88tVwTwWbxE+Pm9onZ4jlDi4=; b=HrBsMeD3Rd/yIvbxdGFmJjQudl8ejjI9bTs9mBUTbqFiR95XngBshTTDcztkHVWnKw +uADNjrlosN11bk3jFubn9UZoxr1cqfx9QHnL+bFHRmqY1IinUQaugAASTv0+M7GWosY QdhAVhglipHR4TiV3X3fw32vaktFplMg0VksYep1ES4sG8AUgUwROxNVHjaMgP2NynU7 SQjypD1d922HfLjAcJSXzI93NL+D6MtlHGhY86gYS1hHklrKf/DLvKRdkNpJZO7f7o/3 mqG0+KRTdjSEmFLDfHMaZP1stA9jTIN1Lbm6ABfZNY+oUlcktjhUba/zqtWAK/L1Vbb/ jGew== X-Gm-Message-State: ABuFfojOASfHCn6QUZ3BE9I915UyvkoFGPF5XCQFN1xUGkuLsSON2nW9 xPPnYZKCe4xDh+VVZKSw5SIyIYYI X-Google-Smtp-Source: ACcGV61QIHAW0X3TJQIg8TZscPZx1gsKQu2av6w0bMvTUTj+y2oHJPFo+bjIfB3UKYiF29VmpXRUGw== X-Received: by 2002:a2e:1b9c:: with SMTP id c28-v6mr24915360ljf.73.1540039222374; Sat, 20 Oct 2018 05:40:22 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.40.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:40:21 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 54/59] config.txt: move uploadpack.* to a separate file Date: Sat, 20 Oct 2018 14:38:43 +0200 Message-Id: <20181020123848.2785-55-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 66 +---------------------------- Documentation/uploadpack-config.txt | 65 ++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 65 deletions(-) create mode 100644 Documentation/uploadpack-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index fef310d47d..f2c3c12ded 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -674,71 +674,7 @@ include::transfer-config.txt[] include::uploadarchive-config.txt[] -uploadpack.hideRefs:: - This variable is the same as `transfer.hideRefs`, but applies - only to `upload-pack` (and so affects only fetches, not pushes). - An attempt to fetch a hidden ref by `git fetch` will fail. See - also `uploadpack.allowTipSHA1InWant`. - -uploadpack.allowTipSHA1InWant:: - When `uploadpack.hideRefs` is in effect, allow `upload-pack` - to accept a fetch request that asks for an object at the tip - of a hidden ref (by default, such a request is rejected). - See also `uploadpack.hideRefs`. Even if this is false, a client - may be able to steal objects via the techniques described in the - "SECURITY" section of the linkgit:gitnamespaces[7] man page; it's - best to keep private data in a separate repository. - -uploadpack.allowReachableSHA1InWant:: - Allow `upload-pack` to accept a fetch request that asks for an - object that is reachable from any ref tip. However, note that - calculating object reachability is computationally expensive. - Defaults to `false`. Even if this is false, a client may be able - to steal objects via the techniques described in the "SECURITY" - section of the linkgit:gitnamespaces[7] man page; it's best to - keep private data in a separate repository. - -uploadpack.allowAnySHA1InWant:: - Allow `upload-pack` to accept a fetch request that asks for any - object at all. - Defaults to `false`. - -uploadpack.keepAlive:: - When `upload-pack` has started `pack-objects`, there may be a - quiet period while `pack-objects` prepares the pack. Normally - it would output progress information, but if `--quiet` was used - for the fetch, `pack-objects` will output nothing at all until - the pack data begins. Some clients and networks may consider - the server to be hung and give up. Setting this option instructs - `upload-pack` to send an empty keepalive packet every - `uploadpack.keepAlive` seconds. Setting this option to 0 - disables keepalive packets entirely. The default is 5 seconds. - -uploadpack.packObjectsHook:: - If this option is set, when `upload-pack` would run - `git pack-objects` to create a packfile for a client, it will - run this shell command instead. The `pack-objects` command and - arguments it _would_ have run (including the `git pack-objects` - at the beginning) are appended to the shell command. The stdin - and stdout of the hook are treated as if `pack-objects` itself - was run. I.e., `upload-pack` will feed input intended for - `pack-objects` to the hook, and expects a completed packfile on - stdout. -+ -Note that this configuration variable is ignored if it is seen in the -repository-level config (this is a safety measure against fetching from -untrusted repositories). - -uploadpack.allowFilter:: - If this option is set, `upload-pack` will support partial - clone and partial fetch object filtering. - -uploadpack.allowRefInWant:: - If this option is set, `upload-pack` will support the `ref-in-want` - feature of the protocol version 2 `fetch` command. This feature - is intended for the benefit of load-balanced servers which may - not have the same view of what OIDs their refs point to due to - replication delay. +include::uploadpack-config.txt[] url..insteadOf:: Any URL that starts with this value will be rewritten to diff --git a/Documentation/uploadpack-config.txt b/Documentation/uploadpack-config.txt new file mode 100644 index 0000000000..ed1c835695 --- /dev/null +++ b/Documentation/uploadpack-config.txt @@ -0,0 +1,65 @@ +uploadpack.hideRefs:: + This variable is the same as `transfer.hideRefs`, but applies + only to `upload-pack` (and so affects only fetches, not pushes). + An attempt to fetch a hidden ref by `git fetch` will fail. See + also `uploadpack.allowTipSHA1InWant`. + +uploadpack.allowTipSHA1InWant:: + When `uploadpack.hideRefs` is in effect, allow `upload-pack` + to accept a fetch request that asks for an object at the tip + of a hidden ref (by default, such a request is rejected). + See also `uploadpack.hideRefs`. Even if this is false, a client + may be able to steal objects via the techniques described in the + "SECURITY" section of the linkgit:gitnamespaces[7] man page; it's + best to keep private data in a separate repository. + +uploadpack.allowReachableSHA1InWant:: + Allow `upload-pack` to accept a fetch request that asks for an + object that is reachable from any ref tip. However, note that + calculating object reachability is computationally expensive. + Defaults to `false`. Even if this is false, a client may be able + to steal objects via the techniques described in the "SECURITY" + section of the linkgit:gitnamespaces[7] man page; it's best to + keep private data in a separate repository. + +uploadpack.allowAnySHA1InWant:: + Allow `upload-pack` to accept a fetch request that asks for any + object at all. + Defaults to `false`. + +uploadpack.keepAlive:: + When `upload-pack` has started `pack-objects`, there may be a + quiet period while `pack-objects` prepares the pack. Normally + it would output progress information, but if `--quiet` was used + for the fetch, `pack-objects` will output nothing at all until + the pack data begins. Some clients and networks may consider + the server to be hung and give up. Setting this option instructs + `upload-pack` to send an empty keepalive packet every + `uploadpack.keepAlive` seconds. Setting this option to 0 + disables keepalive packets entirely. The default is 5 seconds. + +uploadpack.packObjectsHook:: + If this option is set, when `upload-pack` would run + `git pack-objects` to create a packfile for a client, it will + run this shell command instead. The `pack-objects` command and + arguments it _would_ have run (including the `git pack-objects` + at the beginning) are appended to the shell command. The stdin + and stdout of the hook are treated as if `pack-objects` itself + was run. I.e., `upload-pack` will feed input intended for + `pack-objects` to the hook, and expects a completed packfile on + stdout. ++ +Note that this configuration variable is ignored if it is seen in the +repository-level config (this is a safety measure against fetching from +untrusted repositories). + +uploadpack.allowFilter:: + If this option is set, `upload-pack` will support partial + clone and partial fetch object filtering. + +uploadpack.allowRefInWant:: + If this option is set, `upload-pack` will support the `ref-in-want` + feature of the protocol version 2 `fetch` command. This feature + is intended for the benefit of load-balanced servers which may + not have the same view of what OIDs their refs point to due to + replication delay. From patchwork Sat Oct 20 12:38:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650507 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 3F08B14E2 for ; Sat, 20 Oct 2018 12:40:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 28F342861D for ; Sat, 20 Oct 2018 12:40:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1D5C528620; Sat, 20 Oct 2018 12:40:28 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 8F63B2861D for ; Sat, 20 Oct 2018 12:40:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727774AbeJTUuq (ORCPT ); Sat, 20 Oct 2018 16:50:46 -0400 Received: from mail-lf1-f65.google.com ([209.85.167.65]:39540 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727764AbeJTUuq (ORCPT ); Sat, 20 Oct 2018 16:50:46 -0400 Received: by mail-lf1-f65.google.com with SMTP id p11-v6so718077lfc.6 for ; Sat, 20 Oct 2018 05:40:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/2kwsoE7lbqQoEeboXqs5RcKdfuwmGuTPxPM6crrt/I=; b=j8J3Yfjh28UP0OJdtEave3XHsr9wtVnjTwedkrBGmVI8hz0O/p2oll/3uqsA7BF66/ tZWpTRFkFPe070b4wd4Xoph7lUVUaxmDu5vdwNhAc0/0MgcdUX4QCN/SyzEZWy62Uymh mGxGNZmPVWRRR9h7w5D3CFJjPksLAnU0I5gtfAoy/3NFgSqwzlz5LQlhxt9wyFcZR5iD ZnYOclyIVhQQi/NtRNkR2Q5e87MfywBr2XKPaCwVraJzBb88ycoYO75RbBj+ny2xM8LN yb3hzpi0Xo5LOQv9Q7e9XpImnxaXFH9QtMDdd7hSRAyqUuKYOWCNqUOcRG4YUBusNaUB EdTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/2kwsoE7lbqQoEeboXqs5RcKdfuwmGuTPxPM6crrt/I=; b=BUM0HDNC3F5fa/p6rR48bfqfovKuDVre8Z5yOT2/vrDEre6PI0bXNBJyobML2DRTiW vIX7iNUzab7M63i0s35GCHqwIk1Qu8/lC6IWonI0DquJlRV9pmF/aMfaI46b7L8aTe40 dFjpJRjH0yidZU2lAiiXTosR/iqg1F01kdWRW9UcoH/ibVEp/HsIGLU4m50OdWycWi/z HmCcTY9hIz1lK3cJvj/4P71tLIAjw6A9BJn9+UMuqQl4fi9SH2RYTZbha13C6IMznD11 c5Z8xnrKjOSvOjsUc0642O5deFWVBqYQcHKlj08NZ7iG91ttdKYEpH0khxtPV1/RhhAC U2jQ== X-Gm-Message-State: ABuFfoiRfrKXbZ4cmaGwevtuiSXw7sK9ZKH5C8PmRFN6Yexoe2S6W06V tnNe6Dny3dq6RkGrUNVRkE2mZQMt X-Google-Smtp-Source: ACcGV63zTdEdMSJHBtzb5EUAqTFLJu9LJxuhFa2gzZ7l9lxuaCxRXj9KZt/ykCliqzVu3QeEzdOIow== X-Received: by 2002:a19:fc09:: with SMTP id a9mr3541513lfi.21.1540039223425; Sat, 20 Oct 2018 05:40:23 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.40.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:40:22 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 55/59] config.txt: move url.* to a separate file Date: Sat, 20 Oct 2018 14:38:44 +0200 Message-Id: <20181020123848.2785-56-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 31 +------------------------------ Documentation/url-config.txt | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 30 deletions(-) create mode 100644 Documentation/url-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index f2c3c12ded..9f38178220 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -676,36 +676,7 @@ include::uploadarchive-config.txt[] include::uploadpack-config.txt[] -url..insteadOf:: - Any URL that starts with this value will be rewritten to - start, instead, with . In cases where some site serves a - large number of repositories, and serves them with multiple - access methods, and some users need to use different access - methods, this feature allows people to specify any of the - equivalent URLs and have Git automatically rewrite the URL to - the best alternative for the particular user, even for a - never-before-seen repository on the site. When more than one - insteadOf strings match a given URL, the longest match is used. -+ -Note that any protocol restrictions will be applied to the rewritten -URL. If the rewrite changes the URL to use a custom protocol or remote -helper, you may need to adjust the `protocol.*.allow` config to permit -the request. In particular, protocols you expect to use for submodules -must be set to `always` rather than the default of `user`. See the -description of `protocol.allow` above. - -url..pushInsteadOf:: - Any URL that starts with this value will not be pushed to; - instead, it will be rewritten to start with , and the - resulting URL will be pushed to. In cases where some site serves - a large number of repositories, and serves them with multiple - access methods, some of which do not allow push, this feature - allows people to specify a pull-only URL and have Git - automatically use an appropriate URL to push, even for a - never-before-seen repository on the site. When more than one - pushInsteadOf strings match a given URL, the longest match is - used. If a remote has an explicit pushurl, Git will ignore this - setting for that remote. +include::url-config.txt[] user.email:: Your email address to be recorded in any newly created commits. diff --git a/Documentation/url-config.txt b/Documentation/url-config.txt new file mode 100644 index 0000000000..e5566c371d --- /dev/null +++ b/Documentation/url-config.txt @@ -0,0 +1,30 @@ +url..insteadOf:: + Any URL that starts with this value will be rewritten to + start, instead, with . In cases where some site serves a + large number of repositories, and serves them with multiple + access methods, and some users need to use different access + methods, this feature allows people to specify any of the + equivalent URLs and have Git automatically rewrite the URL to + the best alternative for the particular user, even for a + never-before-seen repository on the site. When more than one + insteadOf strings match a given URL, the longest match is used. ++ +Note that any protocol restrictions will be applied to the rewritten +URL. If the rewrite changes the URL to use a custom protocol or remote +helper, you may need to adjust the `protocol.*.allow` config to permit +the request. In particular, protocols you expect to use for submodules +must be set to `always` rather than the default of `user`. See the +description of `protocol.allow` above. + +url..pushInsteadOf:: + Any URL that starts with this value will not be pushed to; + instead, it will be rewritten to start with , and the + resulting URL will be pushed to. In cases where some site serves + a large number of repositories, and serves them with multiple + access methods, some of which do not allow push, this feature + allows people to specify a pull-only URL and have Git + automatically use an appropriate URL to push, even for a + never-before-seen repository on the site. When more than one + pushInsteadOf strings match a given URL, the longest match is + used. If a remote has an explicit pushurl, Git will ignore this + setting for that remote. From patchwork Sat Oct 20 12:38:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650511 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 B2A791508 for ; Sat, 20 Oct 2018 12:40:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9D7E02861D for ; Sat, 20 Oct 2018 12:40:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 922922861E; Sat, 20 Oct 2018 12:40:29 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 24E7028620 for ; Sat, 20 Oct 2018 12:40:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727777AbeJTUus (ORCPT ); Sat, 20 Oct 2018 16:50:48 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:36483 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727765AbeJTUur (ORCPT ); Sat, 20 Oct 2018 16:50:47 -0400 Received: by mail-lj1-f193.google.com with SMTP id p89-v6so33112145ljb.3 for ; Sat, 20 Oct 2018 05:40:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JwP33qgS9+KFHm8tvjuW0OoCe6/x/rZQqfGtXr7b/Wo=; b=YhdAWV0hBLt+awueilQwWTiop63W5MXYpdcdfUhE0y1MrD+LutqdZWDNjzDn+Yj79Y SnwgE5Z8pxucJ5Fo7gwYGNfc12vFBB5u9v5RHjhzT+oPyTTMCAa4rdoX9+zpYJE7+ueW vlFbMA1ZqPNORAsg63TSoRvivPpImg4WxfmD3nH90qKmWlJn7oUnaj30uGOOrmXPpKIx GQtw/j8o9fXLxPJn3zvSJ+T1j7SMRbEQSB4JS9gMW4sM6oCkYcxWrAvO3sVHB39GDwSO A/1cj/cOVY4zkSPI3CN+qszJUFhpNpIuUj6LFRrE62SB7d5uJ+Cw44tM2Ip3zvplMd/G 7JhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JwP33qgS9+KFHm8tvjuW0OoCe6/x/rZQqfGtXr7b/Wo=; b=Ni1bEAoFbiM1jqdnfFEoBEtRtzwzyfbpP+Rf9I3xCBFtKTwTDLM1i9bYq8CSvUqcVK TS540lfe/1mzVDtjPSvbvRe9qWrRFwZTjw+orz4qhTa8B6EuRmqVGmGXjJhWCUlO300M Xik4aMMEV+nIsokRR7vx59Tz55YgDkwF3T/N0J3zu+MN/AAjEFVXu3LlHNiWO8zY8Enz b9aXUoFaUjFkE5r/tkJ98dTI9TzK8tk7fp3XsVOJtzfalLCkNS1avXHdGrARvOz3erg5 IwirEG7M81xkwqMwImcowrKkiGPk1fkdqfYWwluEWOKtgnyvoUGZMIEPkfwlaBxQXxZr At9A== X-Gm-Message-State: ABuFfogLMk95ObP66RJ6QVNwGeCxNKe5wTyXIsONA9AKCp0ZRFQvA5/s X4wuM86RxZlpo9ZzoWrF9bAXhN2a X-Google-Smtp-Source: ACcGV60gE+rpK9u0ytUQ65n/rMKTptfIN/E2Y6i+1R8K0gcsYJyCGGCRfqK0WZa7AW/Xu+WIlWHFrw== X-Received: by 2002:a2e:9615:: with SMTP id v21-v6mr25032407ljh.150.1540039224618; Sat, 20 Oct 2018 05:40:24 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.40.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:40:23 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 56/59] config.txt: move user.* to a separate file Date: Sat, 20 Oct 2018 14:38:45 +0200 Message-Id: <20181020123848.2785-57-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 27 +-------------------------- Documentation/user-config.txt | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 26 deletions(-) create mode 100644 Documentation/user-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 9f38178220..3ccf88ea4c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -678,32 +678,7 @@ include::uploadpack-config.txt[] include::url-config.txt[] -user.email:: - Your email address to be recorded in any newly created commits. - Can be overridden by the `GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_EMAIL`, and - `EMAIL` environment variables. See linkgit:git-commit-tree[1]. - -user.name:: - Your full name to be recorded in any newly created commits. - Can be overridden by the `GIT_AUTHOR_NAME` and `GIT_COMMITTER_NAME` - environment variables. See linkgit:git-commit-tree[1]. - -user.useConfigOnly:: - Instruct Git to avoid trying to guess defaults for `user.email` - and `user.name`, and instead retrieve the values only from the - configuration. For example, if you have multiple email addresses - and would like to use a different one for each repository, then - with this configuration option set to `true` in the global config - along with a name, Git will prompt you to set up an email before - making new commits in a newly cloned repository. - Defaults to `false`. - -user.signingKey:: - If linkgit:git-tag[1] or linkgit:git-commit[1] is not selecting the - key you want it to automatically when creating a signed tag or - commit, you can override the default selection with this variable. - This option is passed unchanged to gpg's --local-user parameter, - so you may specify a key using any method that gpg supports. +include::user-config.txt[] versionsort.prereleaseSuffix (deprecated):: Deprecated alias for `versionsort.suffix`. Ignored if diff --git a/Documentation/user-config.txt b/Documentation/user-config.txt new file mode 100644 index 0000000000..b5b2ba1199 --- /dev/null +++ b/Documentation/user-config.txt @@ -0,0 +1,26 @@ +user.email:: + Your email address to be recorded in any newly created commits. + Can be overridden by the `GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_EMAIL`, and + `EMAIL` environment variables. See linkgit:git-commit-tree[1]. + +user.name:: + Your full name to be recorded in any newly created commits. + Can be overridden by the `GIT_AUTHOR_NAME` and `GIT_COMMITTER_NAME` + environment variables. See linkgit:git-commit-tree[1]. + +user.useConfigOnly:: + Instruct Git to avoid trying to guess defaults for `user.email` + and `user.name`, and instead retrieve the values only from the + configuration. For example, if you have multiple email addresses + and would like to use a different one for each repository, then + with this configuration option set to `true` in the global config + along with a name, Git will prompt you to set up an email before + making new commits in a newly cloned repository. + Defaults to `false`. + +user.signingKey:: + If linkgit:git-tag[1] or linkgit:git-commit[1] is not selecting the + key you want it to automatically when creating a signed tag or + commit, you can override the default selection with this variable. + This option is passed unchanged to gpg's --local-user parameter, + so you may specify a key using any method that gpg supports. From patchwork Sat Oct 20 12:38:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650513 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 CD15290 for ; Sat, 20 Oct 2018 12:40:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AA2E42861D for ; Sat, 20 Oct 2018 12:40:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9E9E328623; Sat, 20 Oct 2018 12:40:31 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 145ED2861D for ; Sat, 20 Oct 2018 12:40:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727784AbeJTUut (ORCPT ); Sat, 20 Oct 2018 16:50:49 -0400 Received: from mail-lf1-f68.google.com ([209.85.167.68]:42861 "EHLO mail-lf1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727739AbeJTUus (ORCPT ); Sat, 20 Oct 2018 16:50:48 -0400 Received: by mail-lf1-f68.google.com with SMTP id s10-v6so27111725lfc.9 for ; Sat, 20 Oct 2018 05:40:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SI4+IDM2p23amc/t3O6T/cd4AndKjQoQXD0/G0/lZTc=; b=I1qL7/Zdl8nhly3QFgKi0/la72BBNYvWvnfdrMzJo48jr9UR2gq035KyF5SGSVO1ij t0cTqDJRwiiZpvDDcJmGQIkreDQujOjOFT2txYrVlAoh3MpAWdDYJPcyr8REsTOXhlRB xLet9ejp8w2bL5pBYvnXIUagZkbL4E71nUppkuIQqNfY4P4I3Qf36UaTknXkhtTcSY+b /zMjh3o3mLzh9xDDpyomBGHmeRoG+DTsF7Ofo4TqPtvHIBJ5QovkOWt8C0+B5ReiNmlh BqJMT+sgVaE+p8cQ7r1FCpbtDRuKJJz/Sj52nu8fACbJdu1OP3ElOfBJhm0/DEybppvn OCCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SI4+IDM2p23amc/t3O6T/cd4AndKjQoQXD0/G0/lZTc=; b=eF+53PfT61kCdULujbQHrQz2zFoIfmfUFOlwCtS3pTxkQ9iqhKt2amWK8TFUP5LUYi 7KjaCFik53ishZfYgqZWSSF+f6n+9RRE2y1TRjh2hqtdHLXnblKr9WADWY7ULJi+ABvP 1rkSVw7ledX2xZ7ZoDKWqjrEPvIgyG+NCHyrsReOtfgqyGNZrohQ1IzoGMsSpKcYD9nu frxXeLA8NsmQEuZYuxOllNCTOYvtMC6XeQqyKU8/DusY9nBfcFpUWMVwErg98mpH3U0x 4A1YxUP2eWBxKWKNnQ2xXRvZNtnhwgMEp1volZec6GsEbSNt4fV2VMLNmxRAedAuSz3g Wq/w== X-Gm-Message-State: ABuFfohyU/h1Mljq55FkN3tXCe+IL3MzbC2cyDSP7qSWST5ksbF9n7p6 j4ZTntWp1dUtm4CBFN1N4Z3KYMHv X-Google-Smtp-Source: ACcGV61GVS0Zn38Y4zb+5jw1rS36+s22Ab/NsPbHSRBylnV7XXZ7f5Y+mE7MkmGRV+lGQnriaY0fiQ== X-Received: by 2002:a19:53d9:: with SMTP id h86-v6mr5500577lfl.75.1540039225570; Sat, 20 Oct 2018 05:40:25 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.40.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:40:24 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 57/59] config.txt: move versionsort.* to a separate file Date: Sat, 20 Oct 2018 14:38:46 +0200 Message-Id: <20181020123848.2785-58-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 34 +--------------------------- Documentation/versionsort-config.txt | 33 +++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 33 deletions(-) create mode 100644 Documentation/versionsort-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 3ccf88ea4c..05fb670be2 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -680,39 +680,7 @@ include::url-config.txt[] include::user-config.txt[] -versionsort.prereleaseSuffix (deprecated):: - Deprecated alias for `versionsort.suffix`. Ignored if - `versionsort.suffix` is set. - -versionsort.suffix:: - Even when version sort is used in linkgit:git-tag[1], tagnames - with the same base version but different suffixes are still sorted - lexicographically, resulting e.g. in prerelease tags appearing - after the main release (e.g. "1.0-rc1" after "1.0"). This - variable can be specified to determine the sorting order of tags - with different suffixes. -+ -By specifying a single suffix in this variable, any tagname containing -that suffix will appear before the corresponding main release. E.g. if -the variable is set to "-rc", then all "1.0-rcX" tags will appear before -"1.0". If specified multiple times, once per suffix, then the order of -suffixes in the configuration will determine the sorting order of tagnames -with those suffixes. E.g. if "-pre" appears before "-rc" in the -configuration, then all "1.0-preX" tags will be listed before any -"1.0-rcX" tags. The placement of the main release tag relative to tags -with various suffixes can be determined by specifying the empty suffix -among those other suffixes. E.g. if the suffixes "-rc", "", "-ck" and -"-bfs" appear in the configuration in this order, then all "v4.8-rcX" tags -are listed first, followed by "v4.8", then "v4.8-ckX" and finally -"v4.8-bfsX". -+ -If more than one suffixes match the same tagname, then that tagname will -be sorted according to the suffix which starts at the earliest position in -the tagname. If more than one different matching suffixes start at -that earliest position, then that tagname will be sorted according to the -longest of those suffixes. -The sorting order between different suffixes is undefined if they are -in multiple config files. +include::versionsort-config.txt[] web.browser:: Specify a web browser that may be used by some commands. diff --git a/Documentation/versionsort-config.txt b/Documentation/versionsort-config.txt new file mode 100644 index 0000000000..6c7cc054fa --- /dev/null +++ b/Documentation/versionsort-config.txt @@ -0,0 +1,33 @@ +versionsort.prereleaseSuffix (deprecated):: + Deprecated alias for `versionsort.suffix`. Ignored if + `versionsort.suffix` is set. + +versionsort.suffix:: + Even when version sort is used in linkgit:git-tag[1], tagnames + with the same base version but different suffixes are still sorted + lexicographically, resulting e.g. in prerelease tags appearing + after the main release (e.g. "1.0-rc1" after "1.0"). This + variable can be specified to determine the sorting order of tags + with different suffixes. ++ +By specifying a single suffix in this variable, any tagname containing +that suffix will appear before the corresponding main release. E.g. if +the variable is set to "-rc", then all "1.0-rcX" tags will appear before +"1.0". If specified multiple times, once per suffix, then the order of +suffixes in the configuration will determine the sorting order of tagnames +with those suffixes. E.g. if "-pre" appears before "-rc" in the +configuration, then all "1.0-preX" tags will be listed before any +"1.0-rcX" tags. The placement of the main release tag relative to tags +with various suffixes can be determined by specifying the empty suffix +among those other suffixes. E.g. if the suffixes "-rc", "", "-ck" and +"-bfs" appear in the configuration in this order, then all "v4.8-rcX" tags +are listed first, followed by "v4.8", then "v4.8-ckX" and finally +"v4.8-bfsX". ++ +If more than one suffixes match the same tagname, then that tagname will +be sorted according to the suffix which starts at the earliest position in +the tagname. If more than one different matching suffixes start at +that earliest position, then that tagname will be sorted according to the +longest of those suffixes. +The sorting order between different suffixes is undefined if they are +in multiple config files. From patchwork Sat Oct 20 12:38:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650515 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 0C9AE1508 for ; Sat, 20 Oct 2018 12:40:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EA2982861D for ; Sat, 20 Oct 2018 12:40:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DE8592861E; Sat, 20 Oct 2018 12:40:31 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 93F4428620 for ; Sat, 20 Oct 2018 12:40:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727786AbeJTUuu (ORCPT ); Sat, 20 Oct 2018 16:50:50 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:41649 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727765AbeJTUut (ORCPT ); Sat, 20 Oct 2018 16:50:49 -0400 Received: by mail-lj1-f193.google.com with SMTP id u21-v6so33076548lja.8 for ; Sat, 20 Oct 2018 05:40:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BpbjE5d8gxwgmVBq/RttQFquWp7rFFgQ3Hw4HI2o+mI=; b=CWGDaOtGyx48Eh9TLCDJHN1JJKNtdLvk1cRM5mRE0nF9XK+HCa1JnuZVCdLJEqEYQW z/iTXRZ5qKYZb78d4mp6WKV5tuqL4IbVYl/XZWxE3r8ED9rYgGkZLyuOQ4ikhh5dv0MB WcXdgvIMQhRBEiYD+KG+uUuevL/3QSD3ukoUaZUR7ru23vph4FLjvl2ylOTNURlVOMWQ iS1mtNEWPT0sVWhP6ZMKhehkp0oAZcodazB25jUoWUDdWVeuNo5RdzarTdqm7IwHbDmT GGFvg3kb+hiqp7ikPKm9K7KEfj2V/Cv1IEDnt3k3oo9Mo5wrRDbskyMDXFXYNisofYbz iCBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BpbjE5d8gxwgmVBq/RttQFquWp7rFFgQ3Hw4HI2o+mI=; b=nTx7AzzMarqimtQUW0wppiCUaIxd5U5/FCGMUkYPSncLED6g+cE05pNJJQCnD/0eqm Hf/FgcLYgCOYUCu2649loqDs0meRo6U0KeLJ3VPr1FoYLjuaKCocq8k8KQ/0gnvjgHAX YFAtUP8AV2TTz1rv4vtJUj5zhvC62ATYpjL0HJ2E47z5L8xAi0l+1U1ALQDzx3Fhn1Nc bSM2AAhxkfmAaHRJcAeGdQIXPjTHOj06PTLQ7M43dANay0UvtMcOFzS0L1dRJmlaGuOG qATbkX63oZzAoaV1SogndIlqjkESzqg+WyaNhmPGrG5iukJN5F+9IYEdwYMHRjEF9hci oFyw== X-Gm-Message-State: ABuFfoipHtVg9kcqqhRLpSiN8bwwrnSE8RaD8LR11QUG918HrWC7XJvp Wd9FJbvANQaqop5r3NwJaXkaACU8 X-Google-Smtp-Source: ACcGV603u+64RZFkJPyUJyxx3V7Ne096vDELAaOKh3wHR9gcKBWRt/TPPGAHnb1CJK42HGmS6HNu/Q== X-Received: by 2002:a2e:9851:: with SMTP id e17-v6mr22402176ljj.143.1540039227364; Sat, 20 Oct 2018 05:40:27 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.40.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:40:26 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 58/59] config.txt: move web.* to a separate file Date: Sat, 20 Oct 2018 14:38:47 +0200 Message-Id: <20181020123848.2785-59-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 5 +---- Documentation/web-config.txt | 4 ++++ 2 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 Documentation/web-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 05fb670be2..76a0e3ed90 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -682,10 +682,7 @@ include::user-config.txt[] include::versionsort-config.txt[] -web.browser:: - Specify a web browser that may be used by some commands. - Currently only linkgit:git-instaweb[1] and linkgit:git-help[1] - may use it. +include::web-config.txt[] worktree.guessRemote:: With `add`, if no branch argument, and neither of `-b` nor diff --git a/Documentation/web-config.txt b/Documentation/web-config.txt new file mode 100644 index 0000000000..beec8d1303 --- /dev/null +++ b/Documentation/web-config.txt @@ -0,0 +1,4 @@ +web.browser:: + Specify a web browser that may be used by some commands. + Currently only linkgit:git-instaweb[1] and linkgit:git-help[1] + may use it. From patchwork Sat Oct 20 12:38:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650517 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 DEF4090 for ; Sat, 20 Oct 2018 12:40:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C8B2E2861D for ; Sat, 20 Oct 2018 12:40:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BD7A228620; Sat, 20 Oct 2018 12:40:33 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 657BC2861D for ; Sat, 20 Oct 2018 12:40:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727788AbeJTUux (ORCPT ); Sat, 20 Oct 2018 16:50:53 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:41654 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727778AbeJTUuv (ORCPT ); Sat, 20 Oct 2018 16:50:51 -0400 Received: by mail-lj1-f195.google.com with SMTP id u21-v6so33076579lja.8 for ; Sat, 20 Oct 2018 05:40:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LkayriAszoOFP71wPTMxk2lQzr1phQ0mBh0SA54mcyc=; b=BHSPQ2OdJlCy0ag1igNWiKu/3Rn0uhbHGxWQJM9lpSMwsJgrWPoKvA0wjG66IyeGhT 7rKExNn1SqxBLCFHgg+qAqGPuJ2Z3Y99kj/DNXUrDl8dObJro9qlBZHMN+2M5D7k9QPs Dexe2cZZnFGEgrc6WxRsPFIosNdFb+escUwjK5Ta34529BOldVXnQdUqHpecgo+hoiGW S9b+vknxnpE7Ga+4QxB0XCF5Ynymu5DardktiMRogg2w8bs2qVg6YnEPsdlWQVJxB7Rq Bjvam5uoi1Gdd3dOC9AJDMtOtf9uui62ltsMgQjH+EN3wUrF/IeVfXuaoXBN4hwtv/1v 1TtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LkayriAszoOFP71wPTMxk2lQzr1phQ0mBh0SA54mcyc=; b=byxZn3WtTpDH5BGQSJmplm04GFtJyHWpQDtEFhxzQsNavZuToK1DQT7Up5qPL0scld OnPgtNvRvosJYg4T4N7SZVlNlo/KJj5bz/mC/h7wVegt/iwX9fyeE26xNT9tCK/vLMew Q5xWnZYJ2IWn3aaf9AvSuzQFseeLA2KkeZSqthjWJPgvjG6AKLHipcMCAxTgsbcACE5e N/f9j6Jn0LJQQwfBhA2s0QAiOyA1rJz9SPVkxG8YNk4WgnivpCv+a5p+yxmCNMjDDEQz 5G60zU3ZHKewp9BPCdqMxa+mwbpxM7eS7gxDzKKQzRzKJHcyv9OFlt0pArDzsgO2/Waj 3tjQ== X-Gm-Message-State: ABuFfohOIFuWFDrNEzqeF6FbmBkWImGdyebVTi/S9R6QwHco1TCEJu8n vn57MSa+pl7qrhDDStniRXm1QVHv X-Google-Smtp-Source: ACcGV62NKQF7swureGzq4lW1jXoyYc7F2MgQ2euFgYr0x//8Ptyvw9YxWl5dKMCm0OAugO8w8FesGg== X-Received: by 2002:a2e:8184:: with SMTP id e4-v6mr22461734ljg.138.1540039228423; Sat, 20 Oct 2018 05:40:28 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.40.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:40:27 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 59/59] config.txt: move worktree.* to a separate file Date: Sat, 20 Oct 2018 14:38:48 +0200 Message-Id: <20181020123848.2785-60-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> 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 Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 10 +--------- Documentation/worktree-config.txt | 9 +++++++++ 2 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 Documentation/worktree-config.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 76a0e3ed90..9e2a2e0f90 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -684,12 +684,4 @@ include::versionsort-config.txt[] include::web-config.txt[] -worktree.guessRemote:: - With `add`, if no branch argument, and neither of `-b` nor - `-B` nor `--detach` are given, the command defaults to - creating a new branch from HEAD. If `worktree.guessRemote` is - set to true, `worktree add` tries to find a remote-tracking - branch whose name uniquely matches the new branch name. If - such a branch exists, it is checked out and set as "upstream" - for the new branch. If no such match can be found, it falls - back to creating a new branch from the current HEAD. +include::worktree-config.txt[] diff --git a/Documentation/worktree-config.txt b/Documentation/worktree-config.txt new file mode 100644 index 0000000000..b853798fc2 --- /dev/null +++ b/Documentation/worktree-config.txt @@ -0,0 +1,9 @@ +worktree.guessRemote:: + With `add`, if no branch argument, and neither of `-b` nor + `-B` nor `--detach` are given, the command defaults to + creating a new branch from HEAD. If `worktree.guessRemote` is + set to true, `worktree add` tries to find a remote-tracking + branch whose name uniquely matches the new branch name. If + such a branch exists, it is checked out and set as "upstream" + for the new branch. If no such match can be found, it falls + back to creating a new branch from the current HEAD.