From patchwork Sat Oct 27 06:22: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: 10658071 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 E0FC25A4 for ; Sat, 27 Oct 2018 06:24:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF6572BF7B for ; Sat, 27 Oct 2018 06:24:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C39B82BF91; Sat, 27 Oct 2018 06:24: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 630F32BF90 for ; Sat, 27 Oct 2018 06:24:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728338AbeJ0PDx (ORCPT ); Sat, 27 Oct 2018 11:03:53 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:34992 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728329AbeJ0PDw (ORCPT ); Sat, 27 Oct 2018 11:03:52 -0400 Received: by mail-lj1-f193.google.com with SMTP id o14-v6so3122910ljj.2 for ; Fri, 26 Oct 2018 23:23: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=wZng75x/xPyY6cW/v4hj3GkMpT3ULqbqBLmwppJhagY=; b=uxY4e/vxUSbIeyD/RDLukDVlODF1/EKTD0kum1N52On+proBOpHsdJtoayZVmpsA3l 9fRdIeP2oYT0dUCy2ID+0/1mVf+1bgkQ1YHB9vbZ9DlXeluXeOvpLcia2EheDZk1or+G kO+fkdfHcqXtJu34kqKv+4bj72yWy6MvoJRhZH8H6qyGJ9HwI3zGVMpLCyj+CyNKPgmO zWewWoaVNjNGTzJ3XjgLFE1FxzTU9ZbKer4oA++6joyAS3Nr+t1j2I0JbojK21oX5GQB J2bEM0hkC9cJ6lzz3XMcWstVSU6vRD/9Q934fsSMlKcOWMRQz+tUkxfqZYO421MGAgj0 pjkQ== 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=wZng75x/xPyY6cW/v4hj3GkMpT3ULqbqBLmwppJhagY=; b=eGsT5b718s/NAuYfwo1x+yWMSMdyadBQ6TSHrP/E9wSzxj/6szuq3/IjdLd9QrWrTq yQp28NP2oVd4Ccf/DTV8Pmj4jC/jGARZQLB7v+ZzGMbCImGkPW3m8P2npdASJzB7beu4 M9JXZD8IpiF/fo7QuHfoerhQQlNDJw2vHcV01s0jLfqJyft7FD6OXkluYhfbXtnM6qX2 ymwXy2J4kYchAbuiVgI8wHMvpJ2rlCZBZSUu3J15umMRS9onnyfR2kNrweyQNkbxg0+e 7LTI1DbgD3n+RaRqsw/m7A1aQpms+QP1p6jRJMZeZcEX/D6Fb/rA9HBIWDzYAb+05ZBG deEA== X-Gm-Message-State: AGRZ1gLVmV1RJzbqucLdIUB5y0KnvylKnHEzqwpuM/YckrNZJ01GzCay DuasCEGlLEeFwSyGEas3EoQ75b11 X-Google-Smtp-Source: AJdET5diZ+xTO7nqsQ+fRYudfGgV7GIy1yQT5CuOFQQ8mMinV0ua2h28XMoOJIOBP6wuReLoUpm3ow== X-Received: by 2002:a2e:a202:: with SMTP id h2-v6mr3631763ljm.143.1540621437323; Fri, 26 Oct 2018 23:23: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 c81-v6sm2097487lfe.79.2018.10.26.23.23.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:23:55 -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/78] Update makefile in preparation for Documentation/config/*.txt Date: Sat, 27 Oct 2018 08:22:34 +0200 Message-Id: <20181027062351.30446-2-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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 config.txt is going to be broken down in smaller pieces and put under Documentation/config directory. Update build rules to take these files into account. A dummy file is added to make sure wildcard expansion is predictable (depending on shell setting it could expand to nothing or becomes a path if config directory is empty). The file will be deleted once the move is over. Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/Makefile | 2 +- Documentation/config/dummy.txt | 0 Makefile | 2 +- generate-cmdlist.sh | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 Documentation/config/dummy.txt diff --git a/Documentation/Makefile b/Documentation/Makefile index 95f6a321f2..48d261dc2c 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -285,7 +285,7 @@ docdep_prereqs = \ mergetools-list.made $(mergetools_txt) \ cmd-list.made $(cmds_txt) -doc.dep : $(docdep_prereqs) $(wildcard *.txt) build-docdep.perl +doc.dep : $(docdep_prereqs) $(wildcard *.txt) $(wildcard config/*.txt) build-docdep.perl $(QUIET_GEN)$(RM) $@+ $@ && \ $(PERL_PATH) ./build-docdep.perl >$@+ $(QUIET_STDERR) && \ mv $@+ $@ diff --git a/Documentation/config/dummy.txt b/Documentation/config/dummy.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Makefile b/Makefile index b08d5ea258..e2ca83203f 100644 --- a/Makefile +++ b/Makefile @@ -2068,7 +2068,7 @@ $(BUILT_INS): git$X command-list.h: generate-cmdlist.sh command-list.txt -command-list.h: $(wildcard Documentation/git*.txt) Documentation/*config.txt +command-list.h: $(wildcard Documentation/git*.txt) Documentation/*config.txt Documentation/config/*.txt $(QUIET_GEN)$(SHELL_PATH) ./generate-cmdlist.sh command-list.txt >$@+ && mv $@+ $@ SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):$(GIT_VERSION):\ diff --git a/generate-cmdlist.sh b/generate-cmdlist.sh index fa1e5475e8..709d67405b 100755 --- a/generate-cmdlist.sh +++ b/generate-cmdlist.sh @@ -80,7 +80,7 @@ print_config_list () { cat < X-Patchwork-Id: 10658075 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 AF4805A4 for ; Sat, 27 Oct 2018 06:24:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9B4762BF7B for ; Sat, 27 Oct 2018 06:24:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8F9382BF90; Sat, 27 Oct 2018 06:24: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 D4BAA2BF74 for ; Sat, 27 Oct 2018 06:24:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728342AbeJ0PDz (ORCPT ); Sat, 27 Oct 2018 11:03:55 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:34995 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728014AbeJ0PDz (ORCPT ); Sat, 27 Oct 2018 11:03:55 -0400 Received: by mail-lj1-f196.google.com with SMTP id o14-v6so3122942ljj.2 for ; Fri, 26 Oct 2018 23:23:59 -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=hik3fj9U2ziIFv/gjeD0okCtxQ2COkHG7sR3v0DcC2k=; b=eCjd+/BBr7Xw81oO6Dm1B5bsdVlBCzw+UrN3TBqCOJ36w4afzxdhQ7Sau+eH+vQRWG 2zDoXc2ef59/vrjamr8a7CT/e5dpQlR1+TZdos4hfxa82JQYNqyyHdGyIjGenaqI+id9 ZLrh9+86HlzPFmIAyJH//u2b4M4jY7QLXjUFYgDimmxQ4HWYr3qIDw8YPS6FVEwrUz2i yzlP8PEtS1NRiwrWz4FWS/ozLFlWMFLHZIrCJXgdJIXmMvzO1K7n1J3idY67K77S0Bp0 4iUDN9iwM63+ORZPfQuXva7rddDa5N1MAD0Yz4rya8vWC1ousbreiF48xhEleKQq8wr5 r6Gg== 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=hik3fj9U2ziIFv/gjeD0okCtxQ2COkHG7sR3v0DcC2k=; b=QScoma7szsF/nLaoid1R+nIIUDUUS78+VTVLqnExPXREDI1MG0t5jYjyNDKLDMcSQO JIaoO7tKG5vmKRHe2x8ru9TYY532dA1wAPrPBekZN9Qc0jvtl31MLcudpEyxMfccesOR TE3mBlqqlsTPatM2blruqaCy+DRw2yRyowtThK/L8WRror201HSvdGRsh7n2TQqF97P6 eA6KQb7v8+znZ+pr/pFCOdMJNrslySTe+n1am3NWwvCENv6P/bKVekxWxrb0tlgtyJ8N 2g6gGERooCHHASNbxht7xd3wvUd/QTiR7j7v17tTDdQBG/qtNPWZfd2zFX7cCWk0dJH8 KNkA== X-Gm-Message-State: AGRZ1gKPT5NRqPmDvQF8JV5nvzEtCoIUPJJT/4ZSx12RrzBpxbx7bTXc S/0yZRnlD8nXsCbSHQ0/fOQer8Mu X-Google-Smtp-Source: AJdET5dKR2BTxtihbRHMUu/Xy31/Eve5s2y7Qq2m6F6SvyLyPMTjqtmDO6CICM8XMAaW/no8L49UGg== X-Received: by 2002:a2e:81d3:: with SMTP id s19-v6mr3687838ljg.138.1540621438505; Fri, 26 Oct 2018 23:23:58 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id c81-v6sm2097487lfe.79.2018.10.26.23.23.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:23:57 -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/78] config.txt: move advice.* to a separate file Date: Sat, 27 Oct 2018 08:22:35 +0200 Message-Id: <20181027062351.30446-3-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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 | 88 +-------------------------------- Documentation/config/advice.txt | 86 ++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 87 deletions(-) create mode 100644 Documentation/config/advice.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index ff2d0190f6..4d2e21b534 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -287,93 +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. - resetQuiet:: - Advice to consider using the `--quiet` option to linkgit:git-reset[1] - when the command takes more than 2 seconds to enumerate unstaged - changes after reset. - 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::config/advice.txt[] core.fileMode:: Tells Git if the executable bit of files in the working tree diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt new file mode 100644 index 0000000000..57fcd4c862 --- /dev/null +++ b/Documentation/config/advice.txt @@ -0,0 +1,86 @@ +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. + resetQuiet:: + Advice to consider using the `--quiet` option to linkgit:git-reset[1] + when the command takes more than 2 seconds to enumerate unstaged + changes after reset. + 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. +-- From patchwork Sat Oct 27 06:22: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: 10658085 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 D7C115A4 for ; Sat, 27 Oct 2018 06:24:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BDB832BF74 for ; Sat, 27 Oct 2018 06:24:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B21512BF90; Sat, 27 Oct 2018 06:24: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 675CB2BF74 for ; Sat, 27 Oct 2018 06:24:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728355AbeJ0PD6 (ORCPT ); Sat, 27 Oct 2018 11:03:58 -0400 Received: from mail-lj1-f175.google.com ([209.85.208.175]:42584 "EHLO mail-lj1-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728339AbeJ0PD6 (ORCPT ); Sat, 27 Oct 2018 11:03:58 -0400 Received: by mail-lj1-f175.google.com with SMTP id f3-v6so3105688ljk.9 for ; Fri, 26 Oct 2018 23:24: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=zonHglmsDDI/vNEU8VxI08UGt+RbHcwDigCRC2Phnu4=; b=J0lpCMuutgU23dDHdhyRCNqdX8V7ii0UNuDuU76k87NvfdZ3SFNh7efPyQI853Tc8F 94pjHHz+8bsDESguE8pbokNj4rL+JLkA67X3ZOzF+4BLjAW8SZGDzrZMnmB9hHZdtiet YBdCY+jYeM6I4X5f69lsiHtIGqXuIJ7jqNHSJ1XOxgcs+QUo7G7hatc0zgjwOnTODdsc XNkssuHifoFT6AgrT1EJsNfY9T4V1qe+N9PVh6GWAb+CAWQyYTB9PJQluil3/g2sCi/V qEeEJa7HjBQPddcENAdCeaBNAJf+daeFCSzJCp1im2Gw/iCEMTNhPxTU7nfeAq48Aj6l 0LGg== 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=zonHglmsDDI/vNEU8VxI08UGt+RbHcwDigCRC2Phnu4=; b=ipzlBqe+yNLhd8jR1L2NLo4GlZOZolqxuUT/cv8lG1DP9VM6biqqeCRJ1Re+fRw7Br nHTOidLr502ptHId2mKMmT2TkUXQpggW2+ytVXfFSojHxUbmukGr7A5gKY8pMq1qWDeS Ao2zdRZ/cCF/7UH8JXf7LNy2ufP9o/aYQhpOTM9QcmZhqtYyPYcpcXeyjuTKcGpyWf2p hTm2f7LBlTAK8puB3DDhd2BYvr9qzI5+uZv+4kh2lO3khKiL0HagfTXSJWlOwITv9IsP yhfhgJh+mQ7LAR2qNUyJDXtTHeZL6w4KxZV5gm89+EMXIUV+85aAhRjtVTSmZaUgpfNU xqyg== X-Gm-Message-State: AGRZ1gLJvZBfKQc4iKcrAJiiF1gDqSPIn3Awa8tJ52C9cnX1klatmTvP Nl4JXuHKys8h397BnG90X4WlkS2F X-Google-Smtp-Source: AJdET5dxb6BzQfF7eUazqvhfbUmMXTTQc2WH9RMwwCIBxKBXnLegmebQc44miasvbuTCYmsxh0WMzQ== X-Received: by 2002:a2e:8743:: with SMTP id q3-v6mr4473415ljj.80.1540621439797; Fri, 26 Oct 2018 23:23: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 c81-v6sm2097487lfe.79.2018.10.26.23.23.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:23: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 03/78] config.txt: move core.* to a separate file Date: Sat, 27 Oct 2018 08:22:36 +0200 Message-Id: <20181027062351.30446-4-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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/config/core.txt | 594 +++++++++++++++++++++++++++++++++ 2 files changed, 595 insertions(+), 594 deletions(-) create mode 100644 Documentation/config/core.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 4d2e21b534..2ba70144c7 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -289,600 +289,7 @@ other popular tools, and describe them in your documentation. include::config/advice.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::config/core.txt[] add.ignoreErrors:: add.ignore-errors (deprecated):: diff --git a/Documentation/config/core.txt b/Documentation/config/core.txt new file mode 100644 index 0000000000..73430b635b --- /dev/null +++ b/Documentation/config/core.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 27 06:22: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: 10658077 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 15DBA1751 for ; Sat, 27 Oct 2018 06:24:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 03ACF2BF74 for ; Sat, 27 Oct 2018 06:24:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EC3B62BF90; Sat, 27 Oct 2018 06:24: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 94E052BF74 for ; Sat, 27 Oct 2018 06:24:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728346AbeJ0PD4 (ORCPT ); Sat, 27 Oct 2018 11:03:56 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:41750 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728329AbeJ0PD4 (ORCPT ); Sat, 27 Oct 2018 11:03:56 -0400 Received: by mail-lj1-f193.google.com with SMTP id u21-v6so3099551lja.8 for ; Fri, 26 Oct 2018 23:24: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=6xNi1wu5/NCI+Jcdkmn060YzovaziHykZYaqFItuBcM=; b=NeFcsm3WaACjQBXu+zsaRqxwgfOY3tnXddoIGlk/wR6KR2wev+/OK65Mfh8wkJAdzi QyhMHCOPLD24frMhemLesw+VpbTX7Bn5rrKj+bXm2upAJvU8fybEFouy/bNQIYF7PoEA vU+LoTu9py22PAOyC4093gDTWVccsQAvKMeZBzORBqmHpjcKFK1pcXv8JG+D5V1DITFm /v4iD+zk4w90UEgDJdLUUvRmUuQ8gJKwYbl+7jRNaPlS2Z3+LlTdeZHoIFgY1+2twGh+ 9KYb2+ELuoWayZBVlM49FTiUrz+VUyjEc0Z4inE3tFiOSoTwy95Hej7uv2bIoDFcy/qR i02A== 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=6xNi1wu5/NCI+Jcdkmn060YzovaziHykZYaqFItuBcM=; b=JNkzoakEbaWi3SIR++cfhhJoSJb9UfPaOtpTzPnqBO+CYzZN+tD+Z5wNcYP2+5AMcU XEyrbJBRQYIOqcxWlO1Adr/Zri9jMWnMvNUpJVHYuy/CLpKk1H2kueMREOXH9ToS33pX n3UNTXMtUze2OAx+aNmBafLlHQLKLTaaJcllyRYKYvPX+fm8OIMu9ivq8KcvLrhQYNde tL7xwdK466i9z1MiHjesgoRev6ObKoeX1j9v1MNnaIu3WsPWN4wSmW1LbA35S55VAYQu 0TzYewxXFlBHANQG28Cy7F1JSHLY85ElXpHhxgjT1Ed9A4vFo5DXVXDT34ptjT9rJOtY fxbw== X-Gm-Message-State: AGRZ1gLrd+8F9CdTF2cOxlTDeq8JjI5Vr8pj1JzZhaAM9oCPfVn1dTND Tfhjc1DHvRz4Z6DTBy6entlFM5Xc X-Google-Smtp-Source: AJdET5exk7ypSjIJCsHEVN+7CYoPOtuKFVdZ/x7LTfUBi+f4FdnLmX1+9Jp6QuCAKa/xEBqTFX+FNg== X-Received: by 2002:a2e:2b46:: with SMTP id q67-v6mr4088440lje.126.1540621440767; Fri, 26 Oct 2018 23:24:00 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id c81-v6sm2097487lfe.79.2018.10.26.23.23.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24: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/78] config.txt: move add.* to a separate file Date: Sat, 27 Oct 2018 08:22:37 +0200 Message-Id: <20181027062351.30446-5-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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 | 8 +------- Documentation/config/add.txt | 7 +++++++ 2 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 Documentation/config/add.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 2ba70144c7..77e45e5219 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -291,13 +291,7 @@ include::config/advice.txt[] include::config/core.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::config/add.txt[] alias.*:: Command aliases for the linkgit:git[1] command wrapper - e.g. diff --git a/Documentation/config/add.txt b/Documentation/config/add.txt new file mode 100644 index 0000000000..4d753f006e --- /dev/null +++ b/Documentation/config/add.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. From patchwork Sat Oct 27 06:22: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: 10658079 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 8033E14E2 for ; Sat, 27 Oct 2018 06:24:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D2082BF7B for ; Sat, 27 Oct 2018 06:24:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 617302BF90; Sat, 27 Oct 2018 06:24: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 E4BA02BF74 for ; Sat, 27 Oct 2018 06:24:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728351AbeJ0PD6 (ORCPT ); Sat, 27 Oct 2018 11:03:58 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:41753 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728014AbeJ0PD5 (ORCPT ); Sat, 27 Oct 2018 11:03:57 -0400 Received: by mail-lj1-f195.google.com with SMTP id u21-v6so3099579lja.8 for ; Fri, 26 Oct 2018 23:24: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=wQpBcRyD+0qaso8r/9FYv2+ZrSKUq60n/QW//I2GpGg=; b=nOVsi6AYPepG0uzjH+CjdSnWDRLEPWW8yVr483xbvBMjYOBGrjABqaYGDxgnk+dpb9 dZX+i1ZxfCUSMCkbnXyOi6RsdUwoA+GUf7JH2fSqyheaWpWGCpDDu/CJtTfIkkfoeKI5 uWzR1DskmrGwd606FxTBeRkvWRTlEV0SGSoguIkQG2lO0sLMm88m1SnCAjvm1srdJoyW 33Rh2SbIhs9fZdBMoHtdy3Sakx9A6y0HhI46l28UNLst68yleyQZpN4xaCFuWIrvZXqm 2jAu9WupWXadUtZQHCTE5cTDAPaxKc7GR1d7v0zwmm9TkAr741dULunT3CzYEGdmUGPZ Q44Q== 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=wQpBcRyD+0qaso8r/9FYv2+ZrSKUq60n/QW//I2GpGg=; b=eYoYJb2urgI03OdHH4UQ2XKhEnAciRSZX39kaIr6/XUT8lUSbpLWE2x+khMuu5QdtZ ByFrtQXV5y4MjtOa1gECVDMWwXiSN/VC4ZvV0D7SgC0b2+hl2paFS+h1mm5wckT+wEwr RKa0HoS8jHtuWlOu4dkl8Fby9YwIRlXaO3XT+PoGdTq6KaQln553NMjuQZlGzh4Ifx4O OICkk0+xQCGwxdZfh1prgZdG20odm9BaejCfAS1P9rcqIAbz/hQpx/EJqoobDGTaesYp 0cypY2t5KbT0vdk+5N1M5uIBE0bPs59VQGGdcBNQrYhVv/2sIY0vcUNKE9N+8Y0j6LzI ODmQ== X-Gm-Message-State: AGRZ1gL10XTsGZXxEXze+uwrZdXN58NEb1Sw16FnyfmS7xZc6l2oz8Kj rvWohuppo+IXnM15Ar1OYezSjLOp X-Google-Smtp-Source: AJdET5ecFbG9GpH3MSYOG+LauICU22MzqOL+4tPv6dCNd+4/zjfK/JxzTNiNziTxRBhkb6oPio+3mQ== X-Received: by 2002:a2e:83d7:: with SMTP id s23-v6mr4564472ljh.0.1540621442029; Fri, 26 Oct 2018 23:24: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 c81-v6sm2097487lfe.79.2018.10.26.23.24.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24: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/78] config.txt: move alias.* to a separate file Date: Sat, 27 Oct 2018 08:22:38 +0200 Message-Id: <20181027062351.30446-6-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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 | 19 +------------------ Documentation/config/alias.txt | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 18 deletions(-) create mode 100644 Documentation/config/alias.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 77e45e5219..f207cae90c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -293,24 +293,7 @@ include::config/core.txt[] include::config/add.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::config/alias.txt[] am.keepcr:: If true, git-am will call git-mailsplit for patches in mbox format diff --git a/Documentation/config/alias.txt b/Documentation/config/alias.txt new file mode 100644 index 0000000000..0b14178314 --- /dev/null +++ b/Documentation/config/alias.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]. From patchwork Sat Oct 27 06:22: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: 10658083 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 D65805A4 for ; Sat, 27 Oct 2018 06:24:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C3C662BF7B for ; Sat, 27 Oct 2018 06:24:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B88A12BF91; Sat, 27 Oct 2018 06:24:08 +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 5DD1E2BF7B for ; Sat, 27 Oct 2018 06:24:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728359AbeJ0PEA (ORCPT ); Sat, 27 Oct 2018 11:04:00 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:44790 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728329AbeJ0PD6 (ORCPT ); Sat, 27 Oct 2018 11:03:58 -0400 Received: by mail-lj1-f195.google.com with SMTP id v6-v6so3084128ljc.11 for ; Fri, 26 Oct 2018 23:24: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=S93iUWR5Uw0yWDycim3Foh3fsn/aG104t2zLA9QuxK4=; b=jOljD0NjNqVxH+4NxF+BAuK38bfI/9Ot4KIQnq6fag+uNWs9Ed9NYl8VReqe1admrF zv8XnYq1SvoQfn57WcxO7Mr9jeh75xyyTnqm/wMmFsSTEtnm3yZqwhnW3u2g6qAgjYmJ OtjGMZf0rhGMQwUNf3qVl0Xb69LGWrR2UyykzdxPZ5y1CXnQg4yYAMR5lzzow5es53St vSYe2ZDbUSiXQMfF0GZA7xETspmQ/PKl+22NiW+BbfBhlkFO6DzYlkYXqQOQJCP/mk5x O6lJYbLQS6Jqs519rwGKMstMVwSCUyfTLgN0GJa9N7PpqggTMqHWtBotyh4GRaCZILej oAOQ== 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=S93iUWR5Uw0yWDycim3Foh3fsn/aG104t2zLA9QuxK4=; b=BxNgASnb5bp6pUwR/teib143Azc0TT2iZpxU9w5mFchPbEkwbpzxwONyzwDyfNo05Y UTKHFMaU6zCPfW2tWto9mcqwL4IniJ6bz+gHtTtvYai91kXCxCAZ6fM4JcS4NiI2akHV 6A9zcTJgdaPe/DHcGxQ9a5JllDuDw5ONaIFt+P5R1VpXtX9YsonAP9dKoDE7kxiXYxQW SarRp0Mc3JBNZrN6Un4Kx+W8wgBtS8Vt2XNXndyhYig4vjXxchQXC1eEmedvHzX5obHE XPeLihARlFk6mg0GmUOmIfhZeGhirDSnmXnTfSmwxyj6SyRRZd3IEm4Co3iFKy3OqKBS xNZg== X-Gm-Message-State: AGRZ1gKZa/nFMxBYoFTMmMdOvvaih6HtlGSUTT1LlB7Jau8tx2V0T3l4 L66N6+NNdHuVKGZZYIQVmVFK9v0i X-Google-Smtp-Source: AJdET5eKyABMSUM5LF7m6kZSoRiId9AFxt5Kob3cuIzgfcwnnQfqynJdzBk+JfekmDr9tRMW21nYag== X-Received: by 2002:a2e:5d8f:: with SMTP id v15-v6mr4468108lje.86.1540621443029; Fri, 26 Oct 2018 23:24: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 c81-v6sm2097487lfe.79.2018.10.26.23.24.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24: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/78] config.txt: move am.* to a separate file Date: Sat, 27 Oct 2018 08:22:39 +0200 Message-Id: <20181027062351.30446-7-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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/config/am.txt | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 Documentation/config/am.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index f207cae90c..5e0f76fc6e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -295,20 +295,7 @@ include::config/add.txt[] include::config/alias.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::config/am.txt[] apply.ignoreWhitespace:: When set to 'change', tells 'git apply' to ignore changes in diff --git a/Documentation/config/am.txt b/Documentation/config/am.txt new file mode 100644 index 0000000000..5bcad2efb1 --- /dev/null +++ b/Documentation/config/am.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]. From patchwork Sat Oct 27 06:22: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: 10658087 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 7F7CF1751 for ; Sat, 27 Oct 2018 06:24:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6BB942BF74 for ; Sat, 27 Oct 2018 06:24:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6020A2BF90; Sat, 27 Oct 2018 06:24:10 +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 0595D2BF74 for ; Sat, 27 Oct 2018 06:24:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728367AbeJ0PEC (ORCPT ); Sat, 27 Oct 2018 11:04:02 -0400 Received: from mail-lf1-f65.google.com ([209.85.167.65]:37844 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728014AbeJ0PD7 (ORCPT ); Sat, 27 Oct 2018 11:03:59 -0400 Received: by mail-lf1-f65.google.com with SMTP id a82-v6so2479661lfa.4 for ; Fri, 26 Oct 2018 23:24: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=6U/sfe/BuNGpP2atgJUU58rC/jyasVzEda2nDcz4N0w=; b=TVPJoOsWugkdkRXBLkZ2QRKTJgMG1KB+JwrFv2LGVWmpidcus/ME/+Zfhut7FGja0C HM44Pyi6Mu51+oFZ+4M+jZotGsELDDOOEzlGAY3rFPCyHuRvB7krgb15+hrG7F5gwXhD sfPdIfFs1PruynIPBUk/dlBOrmZEZAw2191FHml0hCzfoWor7OBsKwJAEIK8PhSpR+vT LkZKyYTKTpuxVX/1kk0epxyr89Z97eVmWJdb67VyHgJ3qmiH8cYmT9C2BSU3+9Gyeba3 o+pfWEXTxd0uMc6m3SixbgAhUfOKrQSokFJ5ijhMiRIo21F6f5LXebY/nSvteyM43sXg UQVQ== 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=6U/sfe/BuNGpP2atgJUU58rC/jyasVzEda2nDcz4N0w=; b=E7Ze6drW6Xbq/dPzFuhe3Ifbn2ZraqfCMgsnuFeYWREuPf4sdq2hr0suqUX3lw8ulw FvHbJ8TxkmPtVgZXerdcIIbEp7kft4a5fav3S+IXzT4APegIB2WQXQy0SXykp/tgjLQ/ GaNdkRFAUD7Df1Io76xr9jzOtxlt/avqsak9+lmUeMNYrvUNvUslZeOmRVycQ8z9SSdh PhZKeMBbfKm0Djwyg6vwySwhyjRrm4nRETjahY9f9+ZhVZLkExjJ1CF85NtfR51SvsVD n3OkbGpqE5w3qkh26XjaHpg7mHJk4mj8p6hC2hhnhkitfYWo/SzuaXbO/IivStTRDgLA N5Gg== X-Gm-Message-State: AGRZ1gIJM4DZfZdOeofOTqyIlrH6o9nH1UqWgGzrPLri2ITVujbapI/q TDD3TOUuXYMOQqEwRQqmmg/dYVd9 X-Google-Smtp-Source: AJdET5eZG9bLaOnmZn4nojdobhyd8LeCLRA2EI0idWsWYdjhLxGyEQylw9gmuP4uctCiRbKHH+Mh6w== X-Received: by 2002:a19:6e0b:: with SMTP id j11-v6mr3665064lfc.118.1540621444132; Fri, 26 Oct 2018 23:24: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 c81-v6sm2097487lfe.79.2018.10.26.23.24.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24: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/78] config.txt: move apply.* to a separate file Date: Sat, 27 Oct 2018 08:22:40 +0200 Message-Id: <20181027062351.30446-8-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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 | 12 +----------- Documentation/config/apply.txt | 11 +++++++++++ 2 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 Documentation/config/apply.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 5e0f76fc6e..c8d20227a8 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -297,17 +297,7 @@ include::config/alias.txt[] include::config/am.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::config/apply.txt[] blame.blankBoundary:: Show blank commit object name for boundary commits in diff --git a/Documentation/config/apply.txt b/Documentation/config/apply.txt new file mode 100644 index 0000000000..8fb8ef763d --- /dev/null +++ b/Documentation/config/apply.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]. From patchwork Sat Oct 27 06:22: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: 10658089 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 C2D6E5A4 for ; Sat, 27 Oct 2018 06:24:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B06A42BF74 for ; Sat, 27 Oct 2018 06:24:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A546F2BF91; Sat, 27 Oct 2018 06:24: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 862542BF74 for ; Sat, 27 Oct 2018 06:24:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728363AbeJ0PEC (ORCPT ); Sat, 27 Oct 2018 11:04:02 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:44793 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728356AbeJ0PEA (ORCPT ); Sat, 27 Oct 2018 11:04:00 -0400 Received: by mail-lj1-f196.google.com with SMTP id v6-v6so3084178ljc.11 for ; Fri, 26 Oct 2018 23:24: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=Q44fqojAYNz+6DPA/rRvjhV67XDN4iG8omKcebGOyY0=; b=OnNgKJ7jIZjHj7IosGlOswZY/CNj75Se+VedrLktNBais9ZqlJdcxhXAExOqkGig8w W3/NLMm+x8gnEdyUZQRIuC1p8snPC0YsgdnWJMIjnbXZQ+I7kBOSiEpggAV/F2Xdc9+P w0Wty+Qw/2V1j21DgUM58O+27cnOjvwMllezwZvKq7FSX2N5PS/7ZTYlLLbDMx1Ih4E2 0t+Yp5sUsku5KwYRjradSJPLGqX1db8t1OhMTmDDrSYgXawc5L0i9phev9N+m12Z8doB PvFk2tEybnDK5chLghO2X1+DqrO8S3j4W2bSmVE4XHSNu5XyB1sNEeFN59Itct3dCwOG /HVA== 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=Q44fqojAYNz+6DPA/rRvjhV67XDN4iG8omKcebGOyY0=; b=pMtv9FVm2w/RQGKGJTBuaiTPROWaUoD79HImzK6aYJn5c7aZqYUn5JbS987W33GyLO q4YP+0/6SBXw1BcF0yUYEUM5v7sS0CJ+yAYqis5qSYm9wk97WCLRfXaMMJxGVlAS2MMV zlCYjHaVfCzOpjX207RS9D8PV1Ic+HzUZMZflHTmH4j+sbKcuRhh6nRwBB0AynCtj6yK ptJ7gvscpYTESpi7qS0EzKN6MgRX/MLhSVDKk/krK6QyZTro+Qs+sufUqo5hLMgAOvO4 VD0JwRqU5Y45Wj5rnTLwnwiFw4M9ccEqq9oo0/H72sUfpHshEezsmjsFfQHCtwF4q59V Yg1w== X-Gm-Message-State: AGRZ1gL0+jn09CINwwvX5z9WDIoCSVdyo85oPspfOLP3JA6MT1OW60tw YE3lxrZvnqEWcMof+WLYqk5Zm+7U X-Google-Smtp-Source: AJdET5dWUiFpUdYMnmeFQyfqSgYA+X5m9uJfgLXPBLGVJEjwBpNPZBuHJftdtkSzZxxkUj4kqVmdng== X-Received: by 2002:a2e:8945:: with SMTP id b5-v6mr3987559ljk.20.1540621445246; Fri, 26 Oct 2018 23:24: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 c81-v6sm2097487lfe.79.2018.10.26.23.24.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24: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/78] config.txt: move blame.* to a separate file Date: Sat, 27 Oct 2018 08:22:41 +0200 Message-Id: <20181027062351.30446-9-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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 | 22 +--------------------- Documentation/config/blame.txt | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 21 deletions(-) create mode 100644 Documentation/config/blame.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index c8d20227a8..9ee989bc67 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -299,27 +299,7 @@ include::config/am.txt[] include::config/apply.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::config/blame.txt[] branch.autoSetupMerge:: Tells 'git branch' and 'git checkout' to set up new branches diff --git a/Documentation/config/blame.txt b/Documentation/config/blame.txt new file mode 100644 index 0000000000..67b5c1d1e0 --- /dev/null +++ b/Documentation/config/blame.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. From patchwork Sat Oct 27 06:22: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: 10658095 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 A7F031751 for ; Sat, 27 Oct 2018 06:24:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 93F3D2BF74 for ; Sat, 27 Oct 2018 06:24:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 887D12BF90; Sat, 27 Oct 2018 06:24: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 1A2282BF7B for ; Sat, 27 Oct 2018 06:24:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728370AbeJ0PEE (ORCPT ); Sat, 27 Oct 2018 11:04:04 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:34698 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728329AbeJ0PED (ORCPT ); Sat, 27 Oct 2018 11:04:03 -0400 Received: by mail-lj1-f193.google.com with SMTP id g8-v6so214576ljk.1 for ; Fri, 26 Oct 2018 23:24: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=bwdjXjVxpl+RYWWQQB7fcxKp93borKL8hWBuQEEeL1A=; b=ZsOiqJFTS7PpeK+lm0hbKdpmecJ6UEbQ6m9Pk7TmWc4s9L50yntrxUOQqRl7xkabRt q/Am7IsQBNgJgUcGrTgwh+MVHSxe6dfKS/SP7wT953361J46sevNlu1SxvyWB56VgbXy cjiKH1ESTlLepF/F91AE7PQJ2uVutqXWGxjFQP0LxVyCvM1xofi6F2XDdDKMrk1AWKWz lhyIbnHnncM6nVHJ6dZhxLpNF6hPNU93+GTVCNwMYbkBSOEJtmwRKErOOra4W8xZmxQu WCxmUMI70bdayz7hV/+JWHzuV3SiBiiSEFU/mhvYX5G/Ir3q550qTtuZdIH96wvEi+of VdpA== 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=bwdjXjVxpl+RYWWQQB7fcxKp93borKL8hWBuQEEeL1A=; b=I4Fpm1hmMgjC9kPixI7e6AO3sMGCnB8UR5HXOwMbDEtK+OiLPuvmyrrrQoGoABLqs0 z3/HmcjDdGJXbMjCFgpYlAymDqe4s6ut+uoLNNT7dQMMQdIXtgq1asmQ3qRiedhCrTbw tQZAsH80ghQI6ru0k8qtQOUFOsvm+0vfIG2jsJOUOUb465QfZGziIlXm6L5xzRwNgYk/ M0v4nyqRcv0PRvnQb4w2ywtZZILQRSZTlQYnqcKmR5EOxaPtrubgCF7PqAqVAi5GTgNy 7JGxI2bsHMDzuMmRzZ6qUVAZ0/0Ts6CuB3vswZjTNN8Uj1+V6MZu0BuSZa3kW3uJc3i8 krCw== X-Gm-Message-State: AGRZ1gJQIpPuIbnGJMF8YUWYqfgtd5EObpds7QwLU5jpTW0CT9o5/smH O9nYKsvIXFa1JsB9dQNn0uXwwWZP X-Google-Smtp-Source: AJdET5dPP8egb0Jb/wBtUHE8EOeNPkUzUx9GPCGmnjDrUbTxwkCafLelSq0LCLIfe7nweL6mIfWpIw== X-Received: by 2002:a2e:84c5:: with SMTP id q5-v6mr4018801ljh.65.1540621446235; Fri, 26 Oct 2018 23:24: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 c81-v6sm2097487lfe.79.2018.10.26.23.24.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24: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/78] config.txt: move branch.* to a separate file Date: Sat, 27 Oct 2018 08:22:42 +0200 Message-Id: <20181027062351.30446-10-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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 | 103 +------------------------------- Documentation/config/branch.txt | 102 +++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 102 deletions(-) create mode 100644 Documentation/config/branch.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 9ee989bc67..3dc7dd6cdb 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -301,108 +301,7 @@ include::config/apply.txt[] include::config/blame.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::config/branch.txt[] browser..cmd:: Specify the command to invoke the specified browser. The diff --git a/Documentation/config/branch.txt b/Documentation/config/branch.txt new file mode 100644 index 0000000000..019d60ede2 --- /dev/null +++ b/Documentation/config/branch.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. From patchwork Sat Oct 27 06:22: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: 10658097 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 C219A5A4 for ; Sat, 27 Oct 2018 06:24:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AF4E32BF74 for ; Sat, 27 Oct 2018 06:24:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A3A3E2BF90; Sat, 27 Oct 2018 06:24: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 EF8DF2BF74 for ; Sat, 27 Oct 2018 06:24:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728372AbeJ0PEE (ORCPT ); Sat, 27 Oct 2018 11:04:04 -0400 Received: from mail-lf1-f68.google.com ([209.85.167.68]:46282 "EHLO mail-lf1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728360AbeJ0PED (ORCPT ); Sat, 27 Oct 2018 11:04:03 -0400 Received: by mail-lf1-f68.google.com with SMTP id o2-v6so2461278lfl.13 for ; Fri, 26 Oct 2018 23:24: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=fGXtziuyfOdNZBP0bmkbOJUedvx9CkedTK0WuDoMVRE=; b=pac6zG5azKDtZOd6mu/Cb/7B2t15VBBcrlzKIHE82qUU+ssp4+aZADHE1rmqrfUgso WcsXy48gSLTywTFsHSg+baoGiwZfmVeJGVld0OvvkPNHU6q5BxXp9Ifawf9ypuJ0JJZy dc7OCpATmdfI3WiRoBaUxgL3ttpvvImFdjaZtQhk9LBBpzf/y9TWb8KRGU3d2iwPjG4o DWlUyDvUbNgz0VgBlXBAtjiz8Jpi/tpvIUg/VSuKTrUu7/lyzULXWtmcgOp8rc5Yg2Io dTYg3COpVSLx/JLIcU5aDJEv7oZg8nPjT83dyNyED31lHDFKt0zxivsHUtytH/Rq0OuD XeJQ== 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=fGXtziuyfOdNZBP0bmkbOJUedvx9CkedTK0WuDoMVRE=; b=f11SbLJA/+yPZaS37KyBi9c8mNP2+ORN3yEm67ZGmWpa+YIfy1eyRHAB70VIB4hxii CVxDdq8gJNDpDgTSeCR98uKRbsMO4CWPOpauPy/0vU1k+aEZQ8ozZlga841NcM5mNc+C aL6ZMoC4BLFOrUXes6JRddQ/PBQ7mwxG/CzIpYvaca8DURkqRHRsdnaykk/kVa8zo4Ny K1r7U6WfjNNVkCnlJnYo/4RYtJ79Ad58PjTShYipPab2u9p6MnU2P1Iatw5WUJpMDPbF sXOCnS7tQn6dwMNfaeFGUivqc0EFz5L/Lsnjpv8Rmr9abw1yhTC7dcGcMNEehahypKYE IJhw== X-Gm-Message-State: AGRZ1gLxjnhDDzcs/n298ZvaN7GfPYDI1mWiqMQ9w3QIxzyY6JyeS1Kh 676pQZkF5pfVX3gYvVKOhMWxCNPB X-Google-Smtp-Source: AJdET5fUVzU24nBZTRpt6LD3ttbP+xv0LmVV/yrItyPnOQ0ZTWuO6Md5nUYLcezOfx6cQcdftey/Aw== X-Received: by 2002:a19:660a:: with SMTP id a10-v6mr2513143lfc.100.1540621447501; Fri, 26 Oct 2018 23:24: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 c81-v6sm2097487lfe.79.2018.10.26.23.24.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24: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/78] config.txt: move browser.* to a separate file Date: Sat, 27 Oct 2018 08:22:43 +0200 Message-Id: <20181027062351.30446-11-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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/config/browser.txt | 9 +++++++++ 2 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 Documentation/config/browser.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 3dc7dd6cdb..47eb119976 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -303,15 +303,7 @@ include::config/blame.txt[] include::config/branch.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::config/browser.txt[] checkout.defaultRemote:: When you run 'git checkout ' and only have one diff --git a/Documentation/config/browser.txt b/Documentation/config/browser.txt new file mode 100644 index 0000000000..195df207a6 --- /dev/null +++ b/Documentation/config/browser.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]). From patchwork Sat Oct 27 06:22: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: 10658091 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 614DD1751 for ; Sat, 27 Oct 2018 06:24:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D63F2BF74 for ; Sat, 27 Oct 2018 06:24:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 41B212BF91; Sat, 27 Oct 2018 06:24: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 B54282BF99 for ; Sat, 27 Oct 2018 06:24:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728374AbeJ0PEF (ORCPT ); Sat, 27 Oct 2018 11:04:05 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:42912 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728014AbeJ0PEE (ORCPT ); Sat, 27 Oct 2018 11:04:04 -0400 Received: by mail-lj1-f193.google.com with SMTP id f3-v6so3105811ljk.9 for ; Fri, 26 Oct 2018 23:24: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=vcSzHaNVSifSdBt8+PZEDiTEZwYn85eimBdTK5lmA3o=; b=SkQx3LqJ8acoyV2x9Ncb1FHVsivFZbxaQIUJ+t4SAZdeK88pkvD+Y3f47ZRhEOrc1a gJtiUflBMFve0dwuOlmq+FR+bbwOf31FEcpuqnOqKWXdHBC5e5N8VDGsbFA7A8g/WBhv X+00j8EcNh9Je9aLYnU9ZWaGwFFrmNPF/XdjS2t0hKZMujn8rbqg4JLwJtfL6zd+Zvmm 7MTHplsKPve+iL7SWVRXm4Jb8AxBjRKOw3vlSvXeYebG6nLOijP50gYpm/Qh1Yoqo+HU 4T7ZALxHPwhayfaUi+gLp17OPb1s2biGb0fz1XbavptZkz1J1PMy6O6ZYjbMPKr829u9 rihw== 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=vcSzHaNVSifSdBt8+PZEDiTEZwYn85eimBdTK5lmA3o=; b=rL5xFzXH9l7AVXOTttlISLb6XJwBI7kE5cPBDCS8sdb7+mI7ULz6tqw85pbMPGH/9a 1ZXE4NPQv0VEC1iRmysPjYaaF3g5EcXZerKwA4vvHlae8tRinEr7cTiKGPiuEjgqOb9K I2Ox0mBis2+5ESQr265Qh/5Ur3TbQBbws7Wq1MV4NlOz4n9vUyTL2dDmXeEKaIctV4C1 3xjYE6e4yC7hjjXAbqehzMTqpO86uH61PPl+lAQ6+cx+xFN6siMsu6cbg5j1UbmwHSxJ sQaeCGK1eQ9CiRB6ze3NPrFc3zbj2b6C81tTP/p2+tgS12MN1j4s2HCjqJq3CzTEMPJ/ SLTA== X-Gm-Message-State: AGRZ1gIXVjxJwJeiJ8ITcY8OkqtEtXNW9tVCQxjth+ITmqrbjkZOVGbt P1a7wjGp2p4iHg4FN7mrxTYECl+9 X-Google-Smtp-Source: AJdET5dj7/9rWSA+bMXiuiPr2u+S9rDJBYyK8q7c2k/iPPqvZ1tWkbYMboYyxMwkAsaLal5X84j1FA== X-Received: by 2002:a2e:980f:: with SMTP id a15-v6mr4640496ljj.6.1540621448557; Fri, 26 Oct 2018 23:24: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 c81-v6sm2097487lfe.79.2018.10.26.23.24.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24: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/78] config.txt: move checkout.* to a separate file Date: Sat, 27 Oct 2018 08:22:44 +0200 Message-Id: <20181027062351.30446-12-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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/config/checkout.txt | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 23 deletions(-) create mode 100644 Documentation/config/checkout.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 47eb119976..a473ddc3c3 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -305,29 +305,7 @@ include::config/branch.txt[] include::config/browser.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::config/checkout.txt[] clean.requireForce:: A boolean to make git-clean do nothing unless given -f, diff --git a/Documentation/config/checkout.txt b/Documentation/config/checkout.txt new file mode 100644 index 0000000000..c4118fa196 --- /dev/null +++ b/Documentation/config/checkout.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. From patchwork Sat Oct 27 06:22: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: 10658093 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 6A10714E2 for ; Sat, 27 Oct 2018 06:24:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 576822BF74 for ; Sat, 27 Oct 2018 06:24:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4BBF02BF99; Sat, 27 Oct 2018 06:24: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 F0A372BF74 for ; Sat, 27 Oct 2018 06:24:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728376AbeJ0PEG (ORCPT ); Sat, 27 Oct 2018 11:04:06 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:35004 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728339AbeJ0PEF (ORCPT ); Sat, 27 Oct 2018 11:04:05 -0400 Received: by mail-lj1-f196.google.com with SMTP id o14-v6so3123182ljj.2 for ; Fri, 26 Oct 2018 23:24: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=n6O7CjRSTiAGDw93L0z/CG/RNhdSqIUTfhxPWifkud0=; b=WycLQnjMTHzcUWMmqYM9PDOfbQrFePfqs5frJQeix8LlK4choKsqX41spzDsWWgdPy jBZCPThUfl5lZWvP78rSxvd9X1Nxsm9yERv+KmRD7Q6ytxHWIu3i2pTHDV5v3eqbRH27 MgFqHYLZLEbs5kHU9Ll7kxX2J0vB1EZ8Lq+6yJGb8dqAk+KOtexQzh95PgRJEM27MDwL QpABio/29PFMabWckCiI94zdk8VSm/BIDSDqZ8/RpRnJaDNPFjRrvpn/n42Lpes2xScI HTVOmAV3xOorbwU4Po59pffucsXPauZcn7zXaXaItV2IAyMbPWuIu3q8P2Gsnw91EnC0 gk5w== 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=n6O7CjRSTiAGDw93L0z/CG/RNhdSqIUTfhxPWifkud0=; b=P+c7QQiQ0R5yHL/t1QlId8hRwdAhnVjYT0HkUA5Slgux4i63at0pZ4A41MJUOb0p8n MYoguIsQ2yOiMCvbyTyMl43AOsqxWAfz02ae0+bmr9VxN+rqjSu7mBHqyGagfXdVC7P2 c0nw7OLZ5WIQr75ZF/46KOeo60uQql3AVA9FumTJGnTyLrfKFKY49ubwanOgOBQKUNNv t5m73EJAu6BUyRNhyvFX+o9XOjWsg6RyTKY4yGf2ZiGxhVc27yV3bqHtCbnPaEm+zEio g+Tu26bILkOfWjX8wZtS53TU2cqkP6vHC5TJZbY0cIdPQtbDkv7pQ19crNoXTJF95axZ Dt8Q== X-Gm-Message-State: AGRZ1gIkD99YLbcRkDhchz/CqNYmsukmgS2VNkqWsuugf65hiy0FUKBJ piAxCrRjzcahF8/+vwajfHh5HWHN X-Google-Smtp-Source: AJdET5fdUfQOFw7XgtnXTpanYULc3XQ72ySbOSF3VXApE7lMEoLsVmAWl6vkrfsaGerztKIZ9ntgHw== X-Received: by 2002:a2e:809a:: with SMTP id i26-v6mr2119895ljg.100.1540621449572; Fri, 26 Oct 2018 23:24: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 c81-v6sm2097487lfe.79.2018.10.26.23.24.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24: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 12/78] config.txt: move clean.* to a separate file Date: Sat, 27 Oct 2018 08:22:45 +0200 Message-Id: <20181027062351.30446-13-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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/config/clean.txt | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 Documentation/config/clean.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index a473ddc3c3..b5efac8cc5 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -307,9 +307,7 @@ include::config/browser.txt[] include::config/checkout.txt[] -clean.requireForce:: - A boolean to make git-clean do nothing unless given -f, - -i or -n. Defaults to true. +include::config/clean.txt[] color.advice:: A boolean to enable/disable color in hints (e.g. when a push diff --git a/Documentation/config/clean.txt b/Documentation/config/clean.txt new file mode 100644 index 0000000000..a807c925b9 --- /dev/null +++ b/Documentation/config/clean.txt @@ -0,0 +1,3 @@ +clean.requireForce:: + A boolean to make git-clean do nothing unless given -f, + -i or -n. Defaults to true. From patchwork Sat Oct 27 06:22: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: 10658101 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 3ABE714E2 for ; Sat, 27 Oct 2018 06:24:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 277AF2BF74 for ; Sat, 27 Oct 2018 06:24:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1C0552BF91; Sat, 27 Oct 2018 06:24: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 D471D2BF74 for ; Sat, 27 Oct 2018 06:24:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728393AbeJ0PEL (ORCPT ); Sat, 27 Oct 2018 11:04:11 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:47014 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728339AbeJ0PEJ (ORCPT ); Sat, 27 Oct 2018 11:04:09 -0400 Received: by mail-lj1-f195.google.com with SMTP id x3-v6so3088596lji.13 for ; Fri, 26 Oct 2018 23:24: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=/FFeFUMdiP8WXL7lcW+MXigBHJE9dKpztv3NIMPXesE=; b=kR+Zicp7nd6RkRs96XZQ+DrZsrs9UYaBZNbFEnoNmyUYOJOa7OvPFlD9VshNLav4HM WpBbZLBz7uMJaJDQUQ4z+9mmUyMC58AUJWaiFS8RC86ogpzK7vi9WHCvXY79xAfAd6y3 UdXW9YU6yNvowc3lFQCTafLsFe1ePZoVI9/sjmoUZXZNOfKfL+hC0XMFNI+Q99zc+zUb rLnyskKcPMdsveZ6EYBwxUW2B0fXxXGz+WGHVXVbM4r97eP+g+HR3Y1kPBK6gEG7Lhs5 NA8Dwr/TdXpcQ+Pd+i3Z2GQidK8qfDNwQSczVZdv2tCd4hEM/9mehFDXYh6P9VdXfsvJ dobQ== 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=/FFeFUMdiP8WXL7lcW+MXigBHJE9dKpztv3NIMPXesE=; b=Y5f2Cv4jfhWjTUGwEzBtveCr0x2manLYXZzP+TNYIA2dCPIO1nSZX0A51j+EAcoOeg SE3n7PtWzJ/qwMlMv9ACUQ+KO0x4Nd/OyKulDhReS7xGIRlyHUvu9bM77B5cSuZGemQv 4qNwjS5N3rmv1aGyamu3PY0sdCV7BXYHSlTGHpFpZad74/J6xO1dJ8T0jkJIanc0E9Z9 1YcCQp6imYfzNBm0csPx2r82dY5asbwz7/LsXPPyJld++YipTYQLPw0jRfFFdCd0JZcS A5WTvIC6FrLhkxJx8hNPeOqB2CpW8pBDltCkuKQDfIQ4ZewuNZ1u6jxEgDJHa52zI3yN 1qXw== X-Gm-Message-State: AGRZ1gKDZ9ZzUYd4zdXg1C6K5SD7qM4uXkan1/iCx6Gf3JXJ5hikp2Bj Fu9EPWSuK7B/8o8Dw90VPDPtppa7 X-Google-Smtp-Source: AJdET5fsXUamhySlVxca933pFhPFjOtepOJeY8Ei4kREGJHu0xEQ4QGlvVQI/hYrDWAQO7NbUNEOxw== X-Received: by 2002:a2e:8146:: with SMTP id t6-v6mr4211546ljg.32.1540621451871; Fri, 26 Oct 2018 23:24: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 c81-v6sm2097487lfe.79.2018.10.26.23.24.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24: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/78] config.txt: move color.* to a separate file Date: Sat, 27 Oct 2018 08:22:46 +0200 Message-Id: <20181027062351.30446-14-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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 | 202 +-------------------------------- Documentation/config/color.txt | 201 ++++++++++++++++++++++++++++++++ 2 files changed, 202 insertions(+), 201 deletions(-) create mode 100644 Documentation/config/color.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index b5efac8cc5..399c23e0c5 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -309,207 +309,7 @@ include::config/checkout.txt[] include::config/clean.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::config/color.txt[] column.ui:: Specify whether supported commands should output in columns. diff --git a/Documentation/config/color.txt b/Documentation/config/color.txt new file mode 100644 index 0000000000..8375596c44 --- /dev/null +++ b/Documentation/config/color.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. From patchwork Sat Oct 27 06:22: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: 10658099 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 5865714E2 for ; Sat, 27 Oct 2018 06:24:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 441E02BF74 for ; Sat, 27 Oct 2018 06:24:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 38ABB2BF90; Sat, 27 Oct 2018 06:24: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 BE2F72BF74 for ; Sat, 27 Oct 2018 06:24:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728382AbeJ0PEJ (ORCPT ); Sat, 27 Oct 2018 11:04:09 -0400 Received: from mail-lf1-f67.google.com ([209.85.167.67]:37853 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728378AbeJ0PEI (ORCPT ); Sat, 27 Oct 2018 11:04:08 -0400 Received: by mail-lf1-f67.google.com with SMTP id a82-v6so2479808lfa.4 for ; Fri, 26 Oct 2018 23:24: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=Nb9O4ECxblqOyTLJsxaP/VcrF8Q9d4BpIMbcMUJqzQU=; b=p8sdPe7wiR+fj3yn4XMl9nQ1vAVdq8h4EhZEKaLpcTYnpAiPowy+dYvPlEHT3BCVmM LKIx1hKo1oTwE0HTlmfsFxQXC0rnm4eTEZbK5MSWkgVG0P2lyYd61IQHBtHJw+FBuVUR oqTj+aky4AInzTtIZEDD3aV7C6OhNjExFixwdI4Jf+GKw+cTNS+bOKOh9uYTlnqndGY8 6NVJwKhfTUnBcCaPB4SI7USkNPk9rnGZbQECTcchk1EutVZC1Dg5ehm3Ov3+YpzDi/4D JY6Ld0lSg8MXxtZixDvMLLkb7HlUU6ur2aUGmAv1G0qZo3O8n8CVr2k63B1ofWerwh8G LuEg== 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=Nb9O4ECxblqOyTLJsxaP/VcrF8Q9d4BpIMbcMUJqzQU=; b=hjLD97+YzU2Qv67JEbgmHiZO6UN8P044jmm1+lQ6L32cDh80qzJHTedZnyd8Ds9M3y XpHb20H+PUl3Q9C4OPGyxzWw/p5YeFimGtNU1N3xtyfV6MrUlNL7M2dPOft0UHQvXVBD 2GfT6uxX7GJoE5/FbM8+H35e0427AQd/dZIl0h6OBl2zbPgDKZOXaYnTsRGuIA5oov8D gAxmyvWsBVFPPcp+9RY1cJi9l3iiSk4GVti/rKZWYf2cT1N/5S3L3gLARub1fDfnVf2n W4HytJW0qX/JDgdiW1KA8xfIdBKs8yc0qezAI0pdWUu/V+KHz28IAPdayp7GTTZC6mLN 2/LA== X-Gm-Message-State: AGRZ1gLOAoiJp1sDnguchSaea0Ifgaoofg34HK1NUA0QzBcrtsHl0j1C 8LVqw9JJpeCtwW19biLhPezG3TCq X-Google-Smtp-Source: AJdET5da20feVrvArcqz4rUJ36COYbmRHHoZEelAzwcgbbIimSTm5xH5WlEifRLLM2h4eGrXk224NA== X-Received: by 2002:a19:4287:: with SMTP id p129mr2882483lfa.135.1540621453176; Fri, 26 Oct 2018 23:24: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 c81-v6sm2097487lfe.79.2018.10.26.23.24.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24: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 14/78] config.txt: move column.* to a separate file Date: Sat, 27 Oct 2018 08:22:47 +0200 Message-Id: <20181027062351.30446-15-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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 | 56 +-------------------------------- Documentation/config/column.txt | 55 ++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 55 deletions(-) create mode 100644 Documentation/config/column.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 399c23e0c5..0618a7d974 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -311,61 +311,7 @@ include::config/clean.txt[] include::config/color.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::config/column.txt[] commit.cleanup:: This setting overrides the default of the `--cleanup` option in diff --git a/Documentation/config/column.txt b/Documentation/config/column.txt new file mode 100644 index 0000000000..76aa2f29dc --- /dev/null +++ b/Documentation/config/column.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. From patchwork Sat Oct 27 06:22: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: 10658103 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 7E4D65A4 for ; Sat, 27 Oct 2018 06:24:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6BED32BF74 for ; Sat, 27 Oct 2018 06:24:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 60B8A2BF90; Sat, 27 Oct 2018 06:24: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 E3C472BF7B for ; Sat, 27 Oct 2018 06:24:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728388AbeJ0PEK (ORCPT ); Sat, 27 Oct 2018 11:04:10 -0400 Received: from mail-lf1-f66.google.com ([209.85.167.66]:33831 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728380AbeJ0PEK (ORCPT ); Sat, 27 Oct 2018 11:04:10 -0400 Received: by mail-lf1-f66.google.com with SMTP id n26-v6so2494995lfl.1 for ; Fri, 26 Oct 2018 23:24: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=699IPdRCQsr7h2qK1cjmpQWr0awt9dBZgfRmCD6vJ2w=; b=Nj7yTIVu9TCodR7+lbe/us+4HFwPjSjyvsV4vXrqfNlKkCvyAtwUwN+rv95iDbpY8a FJQrBBuh5zDv1ZXJCErCnv/IEMhSriwCN0o2GvBlPyQVmfqTzuFjS69tUjHW6R4t8bHn Em4zN1KkXfPXcgI3f5wce8ft+x8FYvRlxc9VjL9yFBEiFB+2j6Ehs1FVDp9k1g2W3XgK FtSuvcGy+NrW0WbE/radqXL7p+0rPpl0JDmQpsY5r/lfuKHOKw2L7Ti5AhrOnWnEAB2s hpLVbslX0iriORTU8lPvdBDzpUxZO17xagC6nIQ7QAV2Lba5ffKXu+2AkGIktu4QrR9D 0jzg== 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=699IPdRCQsr7h2qK1cjmpQWr0awt9dBZgfRmCD6vJ2w=; b=qPWIGMMSKAVlaLnFqH956kvo9WNjmowSatp8I+46/D5rIh76IT/R8JqGlebeoCogL7 CXpnUMJTCBsu7pTiVUX7xZKOdRwGBUGw+0WnOFVz8JnwcFhoSsqpl4tOJqC3U9LxerZF wW0ng4tkUGHjP8jrukr94UY7BZeMZkkPWXFLDyV18p3rL3J/rUsCvDqqvcHiiNiELClJ Y3ZccxH6CeFOKnuqRWHm1jUTxdj9C7Lnb+EGfEIL2OgkfwU5hfHip/+Wf4eyB30zCsHo qeuYtiiVNM1S7twbaWfl+RELj5HZ+Gr469QFeV5LdfY3cMjk9yidY0sqUzndcJNE5vpi 1Wfw== X-Gm-Message-State: AGRZ1gIBEICLKqBDzxPad7by54JNjrWd5l/Q9uUzw/2vUtN7dMbqf49z 1yeXjJiWMBfsNDJdVm25RlUG884p X-Google-Smtp-Source: AJdET5d537uI42X06P6L9ee4IbLJjdbmVVmkYIyGZvc4sR1NFcPrmYLKuVFsqfKqlkSZk71nl4QJAw== X-Received: by 2002:a19:25c2:: with SMTP id l185-v6mr2794118lfl.122.1540621454865; Fri, 26 Oct 2018 23:24: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 c81-v6sm2097487lfe.79.2018.10.26.23.24.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24: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/78] config.txt: move commit.* to a separate file Date: Sat, 27 Oct 2018 08:22:48 +0200 Message-Id: <20181027062351.30446-16-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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 | 30 +----------------------------- Documentation/config/commit.txt | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 29 deletions(-) create mode 100644 Documentation/config/commit.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 0618a7d974..bbae7e68bd 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -313,35 +313,7 @@ include::config/color.txt[] include::config/column.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::config/commit.txt[] credential.helper:: Specify an external helper to be called when a username or diff --git a/Documentation/config/commit.txt b/Documentation/config/commit.txt new file mode 100644 index 0000000000..2c95573930 --- /dev/null +++ b/Documentation/config/commit.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]. From patchwork Sat Oct 27 06:22:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10658105 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 0A4E31751 for ; Sat, 27 Oct 2018 06:24:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EBA442BF74 for ; Sat, 27 Oct 2018 06:24:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E07222BF90; Sat, 27 Oct 2018 06:24: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 7BF142BF7B for ; Sat, 27 Oct 2018 06:24:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728400AbeJ0PEM (ORCPT ); Sat, 27 Oct 2018 11:04:12 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:35009 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728378AbeJ0PEM (ORCPT ); Sat, 27 Oct 2018 11:04:12 -0400 Received: by mail-lj1-f195.google.com with SMTP id o14-v6so3123337ljj.2 for ; Fri, 26 Oct 2018 23:24: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=H6drYUH1/GMSP/wuQcru46Wskz6GpcSWiimUIx8GhQo=; b=i1K36HAqZwsJh4Qki0DOHRL5E3AKsHQ6un7PPWfI4/ZDNDRZr6d64Smw3Jw6nH9BJj cc3rNGtP815lj17Oc0neSAKTsl5Cjb25VGedGpbIYn5ieSnmWhtTasJKD+7mfuDqSjtX K0+nkOg9uwRGsoO1I0uP5/bYaeM8dBKnVotJiQ13np8+u4LTYF7rXperVdJ7MXarLIqs 2ArynBc3i2YRAjiWSRy5cppXyLq6gwCqGx1N5cM19DycCz8lA0tE9wIFtvLjf5JEgusD palGITGlPonfRsxPBO61zJHFWE5hsQ9Jco5NPHLGnEoICdBmk9OMAA7InZDe2+cuVuCn DLEg== 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=H6drYUH1/GMSP/wuQcru46Wskz6GpcSWiimUIx8GhQo=; b=jtUI/NKOCgJQsMFs8y57Wxr+o+cS8ZQBas7j5WoKV2XHs4Nv21UqssQDL3We6AMulU 9f7wZXHvD2hezZHbWSILQmVWviUJ9fD4bXAiirT3JMokAX73ZZJ/xYMBlI0l2BMUQC+m cuRqq4S1kezVLIaGW/x8xLR9Pd+6ESkVrR+XSSYGpJfTL5oeXojLnPRtenwzBmJaJ3Ls F3W8478zT/XocmZ1eQCpsWHzGBPMTU5PqeNpE0t/kAC2MYKZZk9S0q74zXY5ylrbuVVi ZYz6WQbrpBV/hDGVylUvFD5KjYui3QlbUDSUYun56k0btRomQjgdN3NDqPkEEi5KTUmo P8pg== X-Gm-Message-State: AGRZ1gJGGY/GRYlTfACoQuHDff9Xg2FF44dFdtHCqib6r7Xl3LQJPX8V q31A7mTcfGvMrw1r1Kw4nH53MzIU X-Google-Smtp-Source: AJdET5dliVesFTcMDhbDx+iWzXQVmXnWAqS9fS41wPzGigPwhOjVTK9umitpa/8g+8tdh0x4nTpzow== X-Received: by 2002:a2e:529d:: with SMTP id n29-v6mr4110445lje.54.1540621456350; Fri, 26 Oct 2018 23:24: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 c81-v6sm2097487lfe.79.2018.10.26.23.24.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24: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 16/78] config.txt: move credential.* to a separate file Date: Sat, 27 Oct 2018 08:22:49 +0200 Message-Id: <20181027062351.30446-17-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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/config/credential.txt | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 26 deletions(-) create mode 100644 Documentation/config/credential.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index bbae7e68bd..2c21a5f366 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -315,32 +315,7 @@ include::config/column.txt[] include::config/commit.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::config/credential.txt[] completion.commands:: This is only used by git-completion.bash to add or remove diff --git a/Documentation/config/credential.txt b/Documentation/config/credential.txt new file mode 100644 index 0000000000..60fb3189e1 --- /dev/null +++ b/Documentation/config/credential.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 27 06:22: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: 10658107 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 5B1CB14E2 for ; Sat, 27 Oct 2018 06:24:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 484742BF74 for ; Sat, 27 Oct 2018 06:24:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3CDD22BF90; Sat, 27 Oct 2018 06:24: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 CFB0D2BF74 for ; Sat, 27 Oct 2018 06:24:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728409AbeJ0PEP (ORCPT ); Sat, 27 Oct 2018 11:04:15 -0400 Received: from mail-lf1-f65.google.com ([209.85.167.65]:36395 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728339AbeJ0PEN (ORCPT ); Sat, 27 Oct 2018 11:04:13 -0400 Received: by mail-lf1-f65.google.com with SMTP id h192so2498095lfg.3 for ; Fri, 26 Oct 2018 23:24:18 -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=yWkQSUbUt1/V5113AZR5PdzUkcgExMPSBm9rDJvAX7g=; b=fcu9LHU6SbeLabJ4W4nKcpGwBhmqoSN9MZtHU+aCFE5NDmHKoZ+uJsZ2/94JbVxPZp kPYavWi5W4zC6Mq/WN5ArT4WEbKIPbdkuD92xiSo39wviNSM7OD0hFqDwbiuIpaU1k7N C3dPxVRmW79DFW+GyWdEmAc/invt5rsetOuIdGkB4Zflyqv6JA7j7zI8STWTmJjkQ9/E +Bs43osDHCgi7Wcp8ZJ1jTzFqkcxdMFjrBCmJuWa/5KxKD3kpIieBqOI9Jfl/bTebhCr PtbZW/xTDQVjaUEGMzawLnvCgWP7lgFuoeWnCERMParDhrolzvn+hhrK4yrm9NWe/Qp8 fj7A== 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=yWkQSUbUt1/V5113AZR5PdzUkcgExMPSBm9rDJvAX7g=; b=QKJbpafwC92zLHHzy3FTLUS1eX7s4nfAZf9R3KvirgG+a6GGRyew5rFTUCYU7pNAZA /ajG5hUhncm/IIaSstatOSkzE3aKrSh082DvKnyQjkXoyxSbJFUabGRKDrnBr6Hu+a5b FJ+ZtGdULz2NC97Ng0z4WAhQLs/6oudfOhtDmkb+nTioBalMVztTFV1mI9VBxlmDjTHf tSyuN1JoUyUJB6gyvH6/lXbLs1nG+lOvrMzwi9XH7a9Mv5KbhlFg6zMTfWYmmOdl/kDH H7dXJlvGPkkBciqVVs5iimQNUUcxMZmgrQhu8ON07PI5Z8BLQyPm4qkPiTRz0FFNKBIo +t3g== X-Gm-Message-State: AGRZ1gLr4VDhXPYGA9I6YfxPWqn9+CiQ47FeOo3g4b5GJa4XrI0JVh1m XYTxSJtVUsftd28hKw4G1kBSx3lR X-Google-Smtp-Source: AJdET5fknAW2vyfOQz6rzIq9QLVOaw5TdkIieEbcd2gRLcfkty9CMn5Rmk9CNGz+Hc+oreVc5si3nA== X-Received: by 2002:a19:7019:: with SMTP id h25-v6mr4026504lfc.147.1540621457487; Fri, 26 Oct 2018 23:24:17 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id c81-v6sm2097487lfe.79.2018.10.26.23.24.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24:16 -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/78] config.txt: move completion.* to a separate file Date: Sat, 27 Oct 2018 08:22:50 +0200 Message-Id: <20181027062351.30446-18-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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 | 8 +------- Documentation/config/completion.txt | 7 +++++++ 2 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 Documentation/config/completion.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 2c21a5f366..83f5ce9056 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -317,13 +317,7 @@ include::config/commit.txt[] include::config/credential.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::config/completion.txt[] include::diff-config.txt[] diff --git a/Documentation/config/completion.txt b/Documentation/config/completion.txt new file mode 100644 index 0000000000..4d99bf33c9 --- /dev/null +++ b/Documentation/config/completion.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. From patchwork Sat Oct 27 06:22: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: 10658109 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 4123814E2 for ; Sat, 27 Oct 2018 06:24:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2E6592BF74 for ; Sat, 27 Oct 2018 06:24:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 22E862BF90; Sat, 27 Oct 2018 06:24:24 +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 CBC642BF74 for ; Sat, 27 Oct 2018 06:24:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728404AbeJ0PEO (ORCPT ); Sat, 27 Oct 2018 11:04:14 -0400 Received: from mail-lf1-f65.google.com ([209.85.167.65]:33028 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728397AbeJ0PEO (ORCPT ); Sat, 27 Oct 2018 11:04:14 -0400 Received: by mail-lf1-f65.google.com with SMTP id w16-v6so2504194lfc.0 for ; Fri, 26 Oct 2018 23:24: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=6NVMum0Q0HoAmXV/kluerySETlzqCfnczC+z2UtP6qo=; b=nlHyiW9JbH9CMYWNzpOu8+rXF7ZdzM85B76xwzBkOJyXLCCs6tDQJK1KKciqbIuT0m rapfhnnezR8Rz2h38nW+ijfSXXstyiw1jYJPMczNSEX3DP6fYhMHQSkXbkMp/oDNnj0a hwlBYJRn2tDqFErL0EyAmIrrOz6cfXFxpf2rsjeM3eAvOK+Dn2OSYzvbokvBUaVA4p7f bW2kXzxq2MiqFh4lQidOwlgEbG4+e5GrW8aJCapXqOaBG9qAnP4nSSrQd8qTQorAfT2Z cc2ifCss/vjmfQQj7nJfkFdq3SplPuUzhTTRtzVuiTqtG/84bmqVQuLSrDfE80AuL7GT 9s0Q== 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=6NVMum0Q0HoAmXV/kluerySETlzqCfnczC+z2UtP6qo=; b=MAwbeeKeLKlJXse35g8yp++Xe9wgmIty9Erkxv8M4th44NfwOJiMSnnORSnlW0Wwk/ PBsEwB/1lOeqoDEDOb+DnYfYNkGDRXH9Ft88Ng2rgQoLV7NPY5rgKCUYkJg0DwaPbGMv KTWcgmuRBM/4tIQXxVnw9IwO1cgyhhWxqjqTAciqd+YhPXh/IEc59HoI3V7YZL7wInNs e3EaHsnrYd5CEsY9s49LO3gmETZGeBYOfdvwrzm0I39yJjR7BuUR/QD5KB+dKz4lj6PO 6zKt3YNmgrAkq/EBcSbJmp5bzskjON/g0xUfuEnwoj7FEmsPJJSp2lhDLJta/9yMHLRZ Tvvw== X-Gm-Message-State: AGRZ1gJkGILLN9lcjHDk9EVr6gR89qfeF7nYF1G4pLtitDPPTZV74mh5 +iQSG9s2EJq0Whz9XnS2QOWwJ33G X-Google-Smtp-Source: AJdET5ckHiVEKATgvs6sEJ6EnX7benB4KQAVVGtgCOobD2Chx+V2j6QcUcnPm5Mw477l1wD+CHrtSg== X-Received: by 2002:a19:ee08:: with SMTP id g8mr3965431lfb.72.1540621458585; Fri, 26 Oct 2018 23:24: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 c81-v6sm2097487lfe.79.2018.10.26.23.24.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24: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/78] config.txt: move diff-config.txt to config/ Date: Sat, 27 Oct 2018 08:22:51 +0200 Message-Id: <20181027062351.30446-19-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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 | 2 +- Documentation/{diff-config.txt => config/diff.txt} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename Documentation/{diff-config.txt => config/diff.txt} (99%) diff --git a/Documentation/config.txt b/Documentation/config.txt index 83f5ce9056..5693ce7654 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -319,7 +319,7 @@ include::config/credential.txt[] include::config/completion.txt[] -include::diff-config.txt[] +include::config/diff.txt[] difftool..path:: Override the path for the given tool. This is useful in case diff --git a/Documentation/diff-config.txt b/Documentation/config/diff.txt similarity index 99% rename from Documentation/diff-config.txt rename to Documentation/config/diff.txt index 85bca83c30..e4db77bc82 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/config/diff.txt @@ -177,7 +177,7 @@ diff.tool:: Any other value is treated as a custom diff tool and requires that a corresponding difftool..cmd variable is defined. -include::mergetools-diff.txt[] +include::../mergetools-diff.txt[] diff.indentHeuristic:: Set this option to `true` to enable experimental heuristics From patchwork Sat Oct 27 06:22: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: 10658113 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 1C9D714E2 for ; Sat, 27 Oct 2018 06:24:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 098CB2BF74 for ; Sat, 27 Oct 2018 06:24:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EF5DE2BF90; Sat, 27 Oct 2018 06:24:24 +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 9468F2BF7B for ; Sat, 27 Oct 2018 06:24:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728415AbeJ0PEQ (ORCPT ); Sat, 27 Oct 2018 11:04:16 -0400 Received: from mail-lf1-f68.google.com ([209.85.167.68]:40886 "EHLO mail-lf1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728378AbeJ0PEP (ORCPT ); Sat, 27 Oct 2018 11:04:15 -0400 Received: by mail-lf1-f68.google.com with SMTP id n3-v6so2485771lfe.7 for ; Fri, 26 Oct 2018 23:24: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=6TP9eMN9NaAPCNaenZ+KaVLBOSeF3/qiCnit3W8CepU=; b=NNhJGZxeR0keE+rR+OZYf92mjyyslcvBjEpeQoxXJU3NVe76LZeAuuOvK4Haw+edXw WuVPfFZzkkZdbQX8gQ0S1qwSDpL8bqLoXCwDV8Yv/hU5azSkUPOKrEBJtgoCXFdNYJ6Z Fo6CIYU9hE/RvDU6D0l148kL8cCPp16FylKi+BvRIvjcR4Kgq8XB8FHF4zenyrXywqKs Z276hj7+USq9OOKHyZFtJD3zf7ksRpkUzPBv3wWFlk46TE2NXTAjGoJTfYDF5xC82YkY jspUchc2DneKZIKb+sxDEeXt4jDzhK3nIz9jUXLoqYJ86xdMquV5FshX+YfvhpYiVmGo lUGQ== 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=6TP9eMN9NaAPCNaenZ+KaVLBOSeF3/qiCnit3W8CepU=; b=tQ0K8phG1paPM2x7QOPeAXjKMmRRDO3sxmXeHYvzU+5XUZ2hY74g1OsKT3Dyne1kEk zOms1mrZhrB8+r6R1FdUEZ8UWIuBGnxNLTFjOQd3sOoRIU+gAzjSiu/37QSDAG98Hb1G 92yq3m/eCx7KydjHw4+2aG6GHR3ejjOnJYA5WcBGgE4roYqxsQcIcodWZEVkMEV9PBvm VKVOk0FB9QsTrmUWW/hzKVlYh76biq/9EhviLi+0922DEHPLaTkn6PpfhQaYvalI8PHw Sb6e/vsGopOtgyK1Eme/UMxrr0drSzdum/IWbuNyG1RCg+DvjUUggkn+wHs2dfr7jqx4 NDhA== X-Gm-Message-State: AGRZ1gLuJ+PU59izELWmdIFzVEz+leXJskuX8I3IRu7qZB+sjTCiiz9X GQkObLU8qVP4l5Or2NdzL9BZND+6 X-Google-Smtp-Source: AJdET5eiJiOpjcKpQbqSJ4qs/Nut7gOQiVaUlKRebUURSciBGxjwBd6LlfxWqM7sSKrYW5bpBDx5FA== X-Received: by 2002:a19:ae03:: with SMTP id f3mr4093678lfc.86.1540621459603; Fri, 26 Oct 2018 23:24: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 c81-v6sm2097487lfe.79.2018.10.26.23.24.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24: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/78] config.txt: move difftool.* to a separate file Date: Sat, 27 Oct 2018 08:22:52 +0200 Message-Id: <20181027062351.30446-20-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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/config/difftool.txt | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 Documentation/config/difftool.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 5693ce7654..f313c7da2e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -321,20 +321,7 @@ include::config/completion.txt[] include::config/diff.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::config/difftool.txt[] fastimport.unpackLimit:: If the number of objects imported by linkgit:git-fast-import[1] diff --git a/Documentation/config/difftool.txt b/Documentation/config/difftool.txt new file mode 100644 index 0000000000..6762594480 --- /dev/null +++ b/Documentation/config/difftool.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 27 06:22: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: 10658111 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 B21265A4 for ; Sat, 27 Oct 2018 06:24:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9FAAF2BF74 for ; Sat, 27 Oct 2018 06:24:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 940582BF90; Sat, 27 Oct 2018 06:24:24 +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 3F5C02BF7B for ; Sat, 27 Oct 2018 06:24:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728412AbeJ0PEQ (ORCPT ); Sat, 27 Oct 2018 11:04:16 -0400 Received: from mail-lf1-f68.google.com ([209.85.167.68]:33033 "EHLO mail-lf1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728397AbeJ0PEP (ORCPT ); Sat, 27 Oct 2018 11:04:15 -0400 Received: by mail-lf1-f68.google.com with SMTP id w16-v6so2504228lfc.0 for ; Fri, 26 Oct 2018 23:24: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=1UlYEITdDmYC4I16wbyssd7Bovli/VVbwWKqUuzNbRo=; b=D791ODkKjMcFMp/pBG/ExxEHqwUDIzFnTI+th5RqIDo39sKqk7Lb6Grjdbo2T4kCz+ WTRJP7adn6AIgzEMf2h4fmHdQjZ0bysW+c9vCRA/BzNlAa1YT1soX0UU9+G+2u8/SppF kunseAFJdiaIkjFDLWkY1Rrhgxc5FOQS8BdlR5Iu/Ttr1i8nbJKaaU6Vb3b8UGIx3e8c pZW0o8Wfh4Cz85KQyFWUGHtrqKDGbv5GzM0I5SdxMZJbxg1QfEvbjfTonpJGsMxRThd8 jaluh9WH+GU1lWliOtW1J7KATy9QJAtFBHJScSoH7c+l599zkRzPY6c1aC7iVZADGp/j Vkgw== 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=1UlYEITdDmYC4I16wbyssd7Bovli/VVbwWKqUuzNbRo=; b=EUd04zg+Ic7U1sR+vUE5yLd7TbbBgipd2he4C7buZMNKl54OyYd69C5uvxKXW4pAuI c5Mn42uQxALYCVN+BhdwEHx/5Th1aRs+RAusS11UTA3zvnq7SAgrP2dxIfwi3F0slLFs KmNTF/OxwDewPx13t1Gd1UuUUXDPYUzRT9kF3RZRiHbY+ZYgZYNvD9CrObgZHweAhE/Q j3ybZz+5rJRPxg6/vEf48ZBHINTWclXmWCW5qRXcgjL52pgRo8aoi7Fp8Qd98u+PU++W GR6++eHqs+G+9Q2hiH2Nr7pvOGIEVoX2zjfkP8EX/Fcmy0X5lmx2xeOBz7BgSZW+fONK 3Q3A== X-Gm-Message-State: AGRZ1gK2fUt/xB4fXrIVbjgWhq2mN3zHUksmBXeCQsYY+mvbwglMNjjH krtVYWt9b2jIRHZzc2TseLoQa/wn X-Google-Smtp-Source: AJdET5e1+180oDKXAPI5DukHVY9331ITBcsvaDLMaa2hwMbUWt2VwNy91cu7w8ZgMKm3q4d4TW1Cgw== X-Received: by 2002:a19:a5cc:: with SMTP id o195-v6mr3810684lfe.92.1540621460637; Fri, 26 Oct 2018 23:24: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 c81-v6sm2097487lfe.79.2018.10.26.23.24.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24: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/78] config.txt: move fastimport.* to a separate file Date: Sat, 27 Oct 2018 08:22:53 +0200 Message-Id: <20181027062351.30446-21-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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/config/fastimport.txt | 8 ++++++++ 2 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 Documentation/config/fastimport.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index f313c7da2e..92bc420245 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -323,14 +323,7 @@ include::config/diff.txt[] include::config/difftool.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::config/fastimport.txt[] include::fetch-config.txt[] diff --git a/Documentation/config/fastimport.txt b/Documentation/config/fastimport.txt new file mode 100644 index 0000000000..c1166e330d --- /dev/null +++ b/Documentation/config/fastimport.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 27 06:22: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: 10658115 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 5C34F5A4 for ; Sat, 27 Oct 2018 06:24:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 48C162BF74 for ; Sat, 27 Oct 2018 06:24:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3D1472BF90; Sat, 27 Oct 2018 06:24: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 DE8A82BF74 for ; Sat, 27 Oct 2018 06:24:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728420AbeJ0PER (ORCPT ); Sat, 27 Oct 2018 11:04:17 -0400 Received: from mail-lf1-f67.google.com ([209.85.167.67]:38743 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728339AbeJ0PER (ORCPT ); Sat, 27 Oct 2018 11:04:17 -0400 Received: by mail-lf1-f67.google.com with SMTP id p86so277128lfg.5 for ; Fri, 26 Oct 2018 23:24:22 -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=R+XFLZnp5BL25Y04XsGgpmh/Gy5JJ445VdUSXW0f5Ig=; b=iwf2ofY4IYiuHx0fxkzu3M5deeh7GndgA+ppIc0RnIqYCWOknJuWv6hHobsT+xW+0e 2pKSWK/65TwoOVPtW65qJnGpQu5n8Cn3VanaP9vf4SUnVMtY28nPdc0WP5LEq0+f9oRc ly7z7I1KaxDNVebVNA+XNMg0pj5x5Al5eHQJwkVTIScumlVW4bgtNB+e7A8+qln1WUvU O/MhTwkoHbM1oZmBe595Ob+qRho6FrbLx14R/0eLBtPmXBzR/6drXknMBYIEw2vNey4B E9O6I1cJTRPL1sLySR48fPWB6qkvTMxtH564+Z4hRG6nkj9P7LSxLQgserLuqlWHV92T hTQQ== 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=R+XFLZnp5BL25Y04XsGgpmh/Gy5JJ445VdUSXW0f5Ig=; b=hqmqRFSepKmfLd5PZ/VjmFL1SXRklAwt/AoGw0oKTF5rEdzbQxGhjFBL/BmrLa/OXj AyinU0l7hjvjzSuuDW96TqlSrWJzMYlx7DaQshU9VSgJ46uVK43vivs0XHFhqjjKZUFT caTYb41gGP9MfmjoeOX8KQDMSOCtC18mxGYp4pivr6wWUNMuNM4mXJgYBtz88qZaRuA/ 5kSoKYoY6zTBvB4pad68tynhK06xIlYQgt7sfr4z/K6bBXCgLKiQQtqqIiLhxOANBara H2CApQLpH4F/dm+9+hZ3VfhZjJWLfhURud/r4TXmBgugJ2yfwpEwQkpNKFP2molPXZyH 1V1A== X-Gm-Message-State: AGRZ1gIpJnsxifjowFjGPPkKrtdUxdj85+iV0vVrZh6kha1gCi+Jtl71 /PgFs2fqneGYiaWeQTLVPcL2vbDc X-Google-Smtp-Source: AJdET5cdthMusNFPhoDpr1F/bi6UW1Tj9NcBXcNIyWUKgnrjVvLQ5SKdc1eMkjR55zaX5qYVwWHvfQ== X-Received: by 2002:a19:750a:: with SMTP id y10mr3732146lfe.43.1540621461654; Fri, 26 Oct 2018 23:24:21 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id c81-v6sm2097487lfe.79.2018.10.26.23.24.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24:20 -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/78] config.txt: move fetch-config.txt to config/ Date: Sat, 27 Oct 2018 08:22:54 +0200 Message-Id: <20181027062351.30446-22-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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 | 2 +- Documentation/{fetch-config.txt => config/fetch.txt} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename Documentation/{fetch-config.txt => config/fetch.txt} (100%) diff --git a/Documentation/config.txt b/Documentation/config.txt index 92bc420245..f85014f803 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -325,7 +325,7 @@ include::config/difftool.txt[] include::config/fastimport.txt[] -include::fetch-config.txt[] +include::config/fetch.txt[] include::format-config.txt[] diff --git a/Documentation/fetch-config.txt b/Documentation/config/fetch.txt similarity index 100% rename from Documentation/fetch-config.txt rename to Documentation/config/fetch.txt From patchwork Sat Oct 27 06:22: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: 10658117 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 DABA81751 for ; Sat, 27 Oct 2018 06:24:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C68212BF74 for ; Sat, 27 Oct 2018 06:24:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BB2182BF90; Sat, 27 Oct 2018 06:24: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 662872BF74 for ; Sat, 27 Oct 2018 06:24:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728425AbeJ0PES (ORCPT ); Sat, 27 Oct 2018 11:04:18 -0400 Received: from mail-lf1-f68.google.com ([209.85.167.68]:43521 "EHLO mail-lf1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728417AbeJ0PES (ORCPT ); Sat, 27 Oct 2018 11:04:18 -0400 Received: by mail-lf1-f68.google.com with SMTP id u18so2472915lff.10 for ; Fri, 26 Oct 2018 23:24: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=MkmNsLywQvc6NV5uIoPjysMpop1iRJQCdovCxQMyAOg=; b=PPEROrXKrU0hxKCBOSEFij56lTeKudDjOtypo55rZbZzV2cae1JX8tRpbcgoxgfKaM HrZ3E6c/SIcASyr3FdwXwPPNdtsC3685/xt2g74L4wAQ7sPKi+r8Uhcipa1qJDoMG7gY 17Izk2sWh5S7crwkuV/9CxRwHlY4LWCoqcYg30w368Al+vm9VZde/MjoaeMBN9vvmm2U 5fLC1/SDOKqgse482qoR1Dy/W6Je9cBG95lzoRJQfe+lRWqmQjHp+cfo7CZg6A7mef1x WXw6kSMrFUpL5F39mS/PJOS/Yu8YrpPtXSjEYiUj7JRmocNjsyrIiFCQ8Ar8X70APgxF Bhzw== 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=MkmNsLywQvc6NV5uIoPjysMpop1iRJQCdovCxQMyAOg=; b=nJ1JYBmvovX0XRDVJlF4uIN6kCQzTlp5YovG6cAP00OJH20fnHT579R5EvGHyKMnqD oLTDmxUFRYB6mM42U9KGwP4d8DuMcSy0/gVwupw93c10+thj7ojX24e9v7DBo0aOjBh2 SMiFT5746lxcYb2/x/0Pb0I2hlepp/bcXGQsTGUKLPgaOAOU06IY1OM+zU7z/ItzjKvK Zzt/LtfTfRxgMCxAy3PqoaWNwFhtpvkI4NlF8Q1OwP59/LnOZWwvEjV2atJm0eHXUU93 v5LfF1DVn18t4necqA2OnlK0+Qp0n4SAlpnvoyNvcwDzclo4yHFrkKuqCdZYTldmfc04 TvuQ== X-Gm-Message-State: AGRZ1gLvyIG62SccpmtTOGyAURZ9r1Kz7Yw3e/joeq2Hk0XCrb0WgBPV r65MdICsObyv+HOwtdfP0De+FGhp X-Google-Smtp-Source: AJdET5fDC+fG4WUnUJO37u/ajdwJq7NooHxq4JU/WNgyZNWFXJaOhjMjP82p1uWuhgIo9mmkGjioZA== X-Received: by 2002:a19:5402:: with SMTP id i2mr3706695lfb.128.1540621462598; Fri, 26 Oct 2018 23:24: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 c81-v6sm2097487lfe.79.2018.10.26.23.24.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24: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 22/78] config.txt: move filter.* to a separate file Date: Sat, 27 Oct 2018 08:22:55 +0200 Message-Id: <20181027062351.30446-23-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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/config/filter.txt | 9 +++++++++ 2 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 Documentation/config/filter.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index f85014f803..a225dc530f 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -329,15 +329,7 @@ include::config/fetch.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::config/filter.txt[] fsck.:: During fsck git may find issues with legacy data which diff --git a/Documentation/config/filter.txt b/Documentation/config/filter.txt new file mode 100644 index 0000000000..90dfe0ba5a --- /dev/null +++ b/Documentation/config/filter.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 27 06:22: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: 10658119 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 3EAA714E2 for ; Sat, 27 Oct 2018 06:24:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2CAF72BF74 for ; Sat, 27 Oct 2018 06:24:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2178C2BF90; Sat, 27 Oct 2018 06:24: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 B94ED2BF74 for ; Sat, 27 Oct 2018 06:24:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728429AbeJ0PET (ORCPT ); Sat, 27 Oct 2018 11:04:19 -0400 Received: from mail-lf1-f68.google.com ([209.85.167.68]:33839 "EHLO mail-lf1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728339AbeJ0PET (ORCPT ); Sat, 27 Oct 2018 11:04:19 -0400 Received: by mail-lf1-f68.google.com with SMTP id n26-v6so2495117lfl.1 for ; Fri, 26 Oct 2018 23:24: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=oMwNaSnlSupVdeK4hXoxnIXFNX4fl1DthIB0l8loZ8Y=; b=b4yLroBaZjhFQFE96iJBgXzu3O9p+QYKfp0Wuv8okww4El1AKqZ/JyQr3AVV2j+JVl s7ZsqH5zGvzPPGj0URX1wj8ni2nIPbGbhUSQuYiu3bIokqs1KttqqMsoY0Ui5J8H+Det vVDsakgo2NroHTtZFE0oADNO2+TMtO29ZAxoh9TW/U9Goj3nU8jFJFJb+lBd4nC0Sv1V PeIqLbT+Ju6drHbGRSSP+6OuFkl+OexPNEiNRly2NdIkKPUZHEnOmyb0WUADe5dFzf1E EKoMBTuvRbtgP4NRpw3Zt8d/1026Fs1kxp0l4azRaFniamwG7GBj7W/FhZ+mOM+gtPT/ 2BPw== 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=oMwNaSnlSupVdeK4hXoxnIXFNX4fl1DthIB0l8loZ8Y=; b=PaBJFDI3z6/O1IwTsh6a+Owkr05OF1pMu2Wg1kON40RngAOlBMrz7aVBHB7MOtsNo2 p8d8DZ2l/eMapvTDQdlVGo7G75I0EyZ1zkMEQ+tmV2eh+5on4VI/ChqkT1xK25RGCpkP +DC2v6vYkCYfbY9tTB0TyvttJ/2ttIT94C34H/9RbSjgqshsb7C4AldgBiIkvtFZJAbg 7CjfJxJSpgkC+zYYrvhnNzlbMOeA4PzduiwOoCzflclXhxRlpr/67JiMXedoEGblV04F A4uRMuAom9CFO5fGzpV0Tlzscv+OP7dX6UiXJDzTWJMlcYaZvlxPhe2Bdj1UCZtsmPkX j4kg== X-Gm-Message-State: AGRZ1gKQAuMML3v1RJDAl7Er75wlzp6Yw7v2arCAY1e040d/JvtAjfAJ HkG8YnggcIUsflQBxI3sHripCZBE X-Google-Smtp-Source: AJdET5dZxWcjvnWpI/Cke4gRBfmi57dpMVA9HjVbFZg1P7QSTrIRFYI/GLGlFs1SnqRC0ZAtWtGy3w== X-Received: by 2002:a19:1b4d:: with SMTP id b74-v6mr3750360lfb.42.1540621463657; Fri, 26 Oct 2018 23:24: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 c81-v6sm2097487lfe.79.2018.10.26.23.24.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24: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 23/78] config.txt: move format-config.txt to config/ Date: Sat, 27 Oct 2018 08:22:56 +0200 Message-Id: <20181027062351.30446-24-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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 | 2 +- Documentation/{format-config.txt => config/format.txt} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename Documentation/{format-config.txt => config/format.txt} (100%) diff --git a/Documentation/config.txt b/Documentation/config.txt index a225dc530f..3dc2285ba5 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -327,7 +327,7 @@ include::config/fastimport.txt[] include::config/fetch.txt[] -include::format-config.txt[] +include::config/format.txt[] include::config/filter.txt[] diff --git a/Documentation/format-config.txt b/Documentation/config/format.txt similarity index 100% rename from Documentation/format-config.txt rename to Documentation/config/format.txt From patchwork Sat Oct 27 06:22: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: 10658121 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 A52A81751 for ; Sat, 27 Oct 2018 06:24:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 92FDE2BF74 for ; Sat, 27 Oct 2018 06:24:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 87C602BF7B; Sat, 27 Oct 2018 06:24: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 359692BF91 for ; Sat, 27 Oct 2018 06:24:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728431AbeJ0PEU (ORCPT ); Sat, 27 Oct 2018 11:04:20 -0400 Received: from mail-lf1-f65.google.com ([209.85.167.65]:39686 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728417AbeJ0PET (ORCPT ); Sat, 27 Oct 2018 11:04:19 -0400 Received: by mail-lf1-f65.google.com with SMTP id p11-v6so2488169lfc.6 for ; Fri, 26 Oct 2018 23:24: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=+dUigzDQWahsQlA6R+Kk2WKiVzjQHiIfE358k1E21n4=; b=EDf2dK2SYLnVCtj3HuzKaToMmA/uqriQnoWteVionstpUnBruSgl07ejQMe5C/zajG RdAeP6QDx675Xm1okBKDTvH1cf+e6IgVvLIhtWthrK+efvt/Acyp90hMfwdt8Skl7GEY ayGIidoQ50mcyHjTrdWtVNdJNoGY6jgqddknJcILmUoctgqcfOT2SJThQkWN4oE+DTP0 ZMqBTmDw+0mHTtf3jDd7m2ZJwC6PfgvQGEpM9tbfeson5PGFOZCE7JUt2n7vJhpMJBxK Pvm3eZWuNjbghULatH6M63pbN1YX6F5YTk2Y9X6saVmCYjEpYVT8Wo++WGC9dXP9MVrJ 0NAw== 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=+dUigzDQWahsQlA6R+Kk2WKiVzjQHiIfE358k1E21n4=; b=BlSX4QoPA0/jUD4J+ieOiA2f/acM1z2dhqt5OXsxmaJ35H8V7nZRWRT6+VBuC8q0UJ cAzK16srLonwK70ZY3ah+BMgARlXRMS8mXGP+cZ4wKVX4UDP9b7rM4UaG57HCmtpllFe VUOB//4R7RB/j0/T2tWnJjZeNjxwJ0wI93SNlh3lY9fj3NzDUArxg8LLxS99VEQVJLx5 AxatPFq7xYdVNVDFpZk7QmxFHItkqmjR0TwrVlLTYX8MiMivqKHJizjkBaBvi/scXwkh ULe4I1Y1mW26KCRd9f1bvtQLLwpr+R7L/bXcBclSLCpWv7ZiYLDUIvyOVt4IbLGu4Fme I5UA== X-Gm-Message-State: AGRZ1gIarLI5O9NS0vgs5NKQ5mQcGo5iH7bL84AKRIygA21MWaxypD8w 1Vjh7Piq+yIh0GmRETElvUuPPVk+ X-Google-Smtp-Source: AJdET5f4ozyhsLqIERKvtg2DQ+TC/Ov3PQRiwasaRrxSAo5ET0yFuwGKleHQehxR/uZpE6hUbSTe9A== X-Received: by 2002:a19:5d45:: with SMTP id p5mr3091519lfj.35.1540621464583; Fri, 26 Oct 2018 23:24: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 c81-v6sm2097487lfe.79.2018.10.26.23.24.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24: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 24/78] config.txt: move fmt-merge-msg-config.txt to config/ Date: Sat, 27 Oct 2018 08:22:57 +0200 Message-Id: <20181027062351.30446-25-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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 Note that this file is not directly included in config.txt but through merge-config.txt and it's in "merge" section instead of a separate "fmtMergeMsg" section like others. Signed-off-by: Nguyễn Thái Ngọc Duy --- .../{fmt-merge-msg-config.txt => config/fmt-merge-msg.txt} | 0 Documentation/git-fmt-merge-msg.txt | 2 +- Documentation/merge-config.txt | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename Documentation/{fmt-merge-msg-config.txt => config/fmt-merge-msg.txt} (100%) diff --git a/Documentation/fmt-merge-msg-config.txt b/Documentation/config/fmt-merge-msg.txt similarity index 100% rename from Documentation/fmt-merge-msg-config.txt rename to Documentation/config/fmt-merge-msg.txt diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt index 423b6e033b..6793d8fc05 100644 --- a/Documentation/git-fmt-merge-msg.txt +++ b/Documentation/git-fmt-merge-msg.txt @@ -51,7 +51,7 @@ OPTIONS CONFIGURATION ------------- -include::fmt-merge-msg-config.txt[] +include::config/fmt-merge-msg.txt[] merge.summary:: Synonym to `merge.log`; this is deprecated and will be removed in diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index 662c2713ca..0bb703fbac 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -30,7 +30,7 @@ merge.verifySignatures:: If true, this is equivalent to the --verify-signatures command line option. See linkgit:git-merge[1] for details. -include::fmt-merge-msg-config.txt[] +include::config/fmt-merge-msg.txt[] merge.renameLimit:: The number of files to consider when performing rename detection From patchwork Sat Oct 27 06:22: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: 10658123 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 3D7945A4 for ; Sat, 27 Oct 2018 06:24:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 27D4F2BF74 for ; Sat, 27 Oct 2018 06:24:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1C33C2BF90; Sat, 27 Oct 2018 06:24: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 586752BF74 for ; Sat, 27 Oct 2018 06:24:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728438AbeJ0PEW (ORCPT ); Sat, 27 Oct 2018 11:04:22 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:39200 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728339AbeJ0PEV (ORCPT ); Sat, 27 Oct 2018 11:04:21 -0400 Received: by mail-lj1-f195.google.com with SMTP id a28-v6so82153ljd.6 for ; Fri, 26 Oct 2018 23:24: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=KOrYKh3/qobLotZj0OgorS02sVmdHMf19T+MOf2jf78=; b=DpfVI36MknHRmNL0oO0y9hUCAaOlczOmTpWyaWY6wKFbVnPP7HcRaXl5VRWASaY21t 83bcTcHTVGDdw810BPfXCmoNDL0ATkAz1H5F2GIGmAZfBPFZk8Tah0fMeAZWFFxjoIll RFrIy60asFHQ1WaMjE3accfec1NqgniI+cfXz35gPsSb8fgylz8aeo3nHzkfpSe2kccD hOZ1UlkTBappsueGKeWXQYOKHlo6cIks43CXDAVETV8bxXp1fjDpzEkcLIUKqheZXeyu HzdUA2274TzHIPH7KkInQrVGTjNIXViA8aHA56TeybtTKWFDm/CmJi6y/LfGAzlO9q9g SRmA== 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=KOrYKh3/qobLotZj0OgorS02sVmdHMf19T+MOf2jf78=; b=p8DyS6FByyQaAXb0qCdXVLiUSvHEAE7l4yow2kVcmGDh18i9wjwc5e9DnkvPSmUunQ I67l4b10GakP+74YjDYLc53JILE51hDJo41ML5GO7fut8AGP+c135LY5hnovUDIzXB7P gqI33EWauDQrGL2kXjcJzZaQcYji8Xfp0x19F5mVseiQIBpxAMEL1uu5izx1ZvTgVfJV LvTe92exx3pcZGhhfZMkwtWTLCUIgb367Ra0DIpkbdIiHlQRLBGop6hm3JOQrB/fTOO8 dunVxRmce1MkNlqAfM76ODc370P+oog+Qc5U8bhoyQx5ngrnNajU1qukuHNqj1n3K5ix iCmA== X-Gm-Message-State: AGRZ1gKoCDwJTSI5/F+Kjr6DFyybSHIuVWNNP33wzyxavuMEhWPBiK/V oVuGH6DtLsMomRQo0iMfHhnlPVIT X-Google-Smtp-Source: AJdET5c2MXc24FxmnV+yNPF0gTvlXKZGaLqs/Zd9Md+H9uUX6FQ5zKG1+1I8sbvxWXGOXl7qPZUD4A== X-Received: by 2002:a2e:1241:: with SMTP id t62-v6mr4019047lje.81.1540621465666; Fri, 26 Oct 2018 23:24: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 c81-v6sm2097487lfe.79.2018.10.26.23.24.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24: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 25/78] config.txt: move fsck.* to a separate file Date: Sat, 27 Oct 2018 08:22:58 +0200 Message-Id: <20181027062351.30446-26-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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/config/fsck.txt | 67 ++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 67 deletions(-) create mode 100644 Documentation/config/fsck.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 3dc2285ba5..f70f95d5cf 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -331,73 +331,7 @@ include::config/format.txt[] include::config/filter.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::config/fsck.txt[] gc.aggressiveDepth:: The depth parameter used in the delta compression diff --git a/Documentation/config/fsck.txt b/Documentation/config/fsck.txt new file mode 100644 index 0000000000..879c5a29c4 --- /dev/null +++ b/Documentation/config/fsck.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 27 06:22: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: 10658125 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 A2ABD5A4 for ; Sat, 27 Oct 2018 06:24:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8DA3B2BF74 for ; Sat, 27 Oct 2018 06:24:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 819C62BF90; Sat, 27 Oct 2018 06:24:32 +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 B0AF32BF74 for ; Sat, 27 Oct 2018 06:24:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728439AbeJ0PEX (ORCPT ); Sat, 27 Oct 2018 11:04:23 -0400 Received: from mail-lf1-f66.google.com ([209.85.167.66]:44118 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728417AbeJ0PEX (ORCPT ); Sat, 27 Oct 2018 11:04:23 -0400 Received: by mail-lf1-f66.google.com with SMTP id m18-v6so2471557lfl.11 for ; Fri, 26 Oct 2018 23:24: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=Q3XPmTqP0G12z0939PDD3XqFijM/s0SbKg08fAcRgRY=; b=nEcZsge9ZUGERss3gN+/AqOW9EcTM5nAho2w6sL79jdkKY6QtDbI8CHMEi11UCX4C8 4bj9oCNEh1BRhn3S64XnEzJbDIxUkdcdoOWWQTpUd9XDCMYYCiFXbTvWDrJCmgizSVv3 v6adQ1S6V0s1nYho0uhHfowqFgdvU70+kACfrbr/U9srwwxPyxcZF5jYAr4mCbZCSvIr wgLLE+eb8wkdsPr+DvhWpA7y0E5eJm9ILayH03QQeG6tRT9RkLYUiRiWTMTOe3Z8/bmF evNIZZjW4x1BYJ8Q6/8vafX4GmUYpKsnaYuLGh2M6uXIqV04F2Ox1T+SJ4APVgPLNTMq 78Cg== 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=Q3XPmTqP0G12z0939PDD3XqFijM/s0SbKg08fAcRgRY=; b=sZ1A6y8ynOKHpCSRgbghWIMtZpWdnLtUmbh5awk34zUGXWKTutVk1Z7/wSu/4FlW6+ ohZx6kUeBn2y5WmOIR9dY/0NuasF8XWYlmMnQELzEG7j41XUFdw1shWtsyS3nSYJqgqz jcztuMiiKmyy0N6u+vcZnRowY+e3xRLu1SxF31BHozt5fisyu+4bVhUxtisqJTTi0ht0 pSrjSktasY3LUcn2SK7S6jUjprhg4uI3MrOyYcAf7Zh8GvVyaMxU8qyxL46UInIZ0Vwp kZEGiMGjTt1Pe/p26jzZ3EjI/pEBdxYRMpXVFfwjWFjcD2vm7gP6TbVvlJRPcngp8E51 A17A== X-Gm-Message-State: AGRZ1gJZ8AKot25/4AwjBDMeuNN+lri/ajcjrjF5P2GKepxNh/xq4vpU NVk1hNNJgLoeImszhwEBSJSL7UnT X-Google-Smtp-Source: AJdET5fpWMXsTAZRWSEzRyfQU1/ry+cpVN10C34kpgYbiBizYfyn/nKz2mAIu7ufVChoXmXMbAToJg== X-Received: by 2002:a19:9e11:: with SMTP id h17mr3898733lfe.73.1540621466571; Fri, 26 Oct 2018 23:24: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 c81-v6sm2097487lfe.79.2018.10.26.23.24.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24: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 26/78] config.txt: move gc.* to a separate file Date: Sat, 27 Oct 2018 08:22:59 +0200 Message-Id: <20181027062351.30446-27-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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/config/gc.txt | 108 +++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 108 deletions(-) create mode 100644 Documentation/config/gc.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index f70f95d5cf..dee012a5d5 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -333,114 +333,7 @@ include::config/filter.txt[] include::config/fsck.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::config/gc.txt[] include::gitcvs-config.txt[] diff --git a/Documentation/config/gc.txt b/Documentation/config/gc.txt new file mode 100644 index 0000000000..c6fbb8a96f --- /dev/null +++ b/Documentation/config/gc.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 27 06:23: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: 10658129 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 655C314E2 for ; Sat, 27 Oct 2018 06:24:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 528F02BF74 for ; Sat, 27 Oct 2018 06:24:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 46F332BF90; Sat, 27 Oct 2018 06:24:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-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 E498D2BF74 for ; Sat, 27 Oct 2018 06:24:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728446AbeJ0PEZ (ORCPT ); Sat, 27 Oct 2018 11:04:25 -0400 Received: from mail-lf1-f67.google.com ([209.85.167.67]:44119 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728435AbeJ0PEX (ORCPT ); Sat, 27 Oct 2018 11:04:23 -0400 Received: by mail-lf1-f67.google.com with SMTP id m18-v6so2471571lfl.11 for ; Fri, 26 Oct 2018 23:24: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=ImS/DiZaLtPEcQfWb6DV2gmASA8B97f0zJP9/cvgz9o=; b=WjseAaRAjLIhaka2gZ0lTNMoG++qLhvs6ghFd0DiOhtuOwFCnKl8WfqHgqicagIza8 8AFt2gJjc1Qe7g1iCnHCgaF3srIDiIcS85LNA4XSsU9Jz72geStzVV9AJkofWnQg8Xhx p2CgWHp3oFbvB8kdXh1rz3Lt5OQilrq8OUoMC6fr/yN7m+/cwOAsaox3GaVvZQCkWHdx BtRzWX5YuvJdAPelZvWxwNZVyyJDQOeU1AykjM04EbOgQmRackSjFzjylj+3CgussmFG yUzHLG52AiryD4JfMIY9bPBRZUmQ337SOPBMCFakBKBQKqiDKagVvTXMEHOJBjnqb3YU ARMQ== 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=ImS/DiZaLtPEcQfWb6DV2gmASA8B97f0zJP9/cvgz9o=; b=qZoFQQOzK8thVZ+HXft/Tke/5g+YX+f1gDHbKZNrPvH5wNMzxEAS8Se2ixvxKFlgwi BgeE2JwjAcGy3NyPHZ2uzcoKGzrj+w0w98EJklLgbjaf2kWqbpTB0KJSIBPLrP+kEtNk bRDe9g5JUP3JD8/WSr5XTCQTi/gLB+PlBAyUWC+FaLFBJNScwgBdV9f1p+7kaYsG4huK jMucTwQ8zTFgJqHYlutN9TEaq7ZhertN/OAow5HWF/Wpyd9JABp/MQyqGGFweBD79Df6 vPU5VcRZ0zWeMdIX0dcd4cigmCtg7Hojg7WnadlSE2MOxSO5PBQ2+HZONYJwZkj5SgVu SX5Q== X-Gm-Message-State: AGRZ1gLtQJU1rAcgyrHjUSS1WLvhnn5Qy5ZFkZDvIzVKRQ3oTRrar4Xj P2CCbKn1MlfSujnmrEyud64jOwBw X-Google-Smtp-Source: AJdET5cwgCEdIcAA82c9QIJHE9bbZfMpPuypcB4JjnVwGqWjl3fsy3ZGucwb1L3U5YDxCppOX6Rd/A== X-Received: by 2002:a19:aace:: with SMTP id t197mr1092756lfe.7.1540621467715; Fri, 26 Oct 2018 23:24: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 c81-v6sm2097487lfe.79.2018.10.26.23.24.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24: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 27/78] config.txt: move gitcvs-config.txt to config/ Date: Sat, 27 Oct 2018 08:23:00 +0200 Message-Id: <20181027062351.30446-28-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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 | 2 +- Documentation/{gitcvs-config.txt => config/gitcvs.txt} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename Documentation/{gitcvs-config.txt => config/gitcvs.txt} (100%) diff --git a/Documentation/config.txt b/Documentation/config.txt index dee012a5d5..6f4a66b3f2 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -335,7 +335,7 @@ include::config/fsck.txt[] include::config/gc.txt[] -include::gitcvs-config.txt[] +include::config/gitcvs.txt[] gitweb.category:: gitweb.description:: diff --git a/Documentation/gitcvs-config.txt b/Documentation/config/gitcvs.txt similarity index 100% rename from Documentation/gitcvs-config.txt rename to Documentation/config/gitcvs.txt From patchwork Sat Oct 27 06:23: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: 10658127 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 82A9014E2 for ; Sat, 27 Oct 2018 06:24:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6FD462BF74 for ; Sat, 27 Oct 2018 06:24:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 642DE2BF90; Sat, 27 Oct 2018 06:24:34 +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 0836A2BF74 for ; Sat, 27 Oct 2018 06:24:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728450AbeJ0PE0 (ORCPT ); Sat, 27 Oct 2018 11:04:26 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:38755 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728339AbeJ0PEZ (ORCPT ); Sat, 27 Oct 2018 11:04:25 -0400 Received: by mail-lj1-f193.google.com with SMTP id k11-v6so3113798lja.5 for ; Fri, 26 Oct 2018 23:24: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=QO0JudaSEH/NPZM/qqOYQ9R2ccoiCRtNBDzjhq4dNZY=; b=WtkiPYknksOFeoJ39F/9LxSVSA3zg5CrjkDK2lNAEzfd9AYEWeugelQxwYTz+G7ubz 1Z3qzekNxECHYI1Lrl/UR8Qw6kegkockC0W+pqk5Tk4Prz76s/CqzQYzORVf0ogHbmYD DfxP4CdFj3BXL+a4vwOi3vJxkNiOZt3ai/Hej0MW9lloLAdog9g/+tjXtbfdzxZ6OYlh v4jU889ZU671Lr8ekma85QF/e9ZbyfJxyEGF7MT11MMQ0Mj38mmPfPdtoBk6FjzXYolU 0jMGiBo8fau4qnsDbLJodxrXDmr0cQ75KSmlJpSBLHvw1idUuG0+bLQc6z/9EYEn+kG0 1n1w== 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=QO0JudaSEH/NPZM/qqOYQ9R2ccoiCRtNBDzjhq4dNZY=; b=KmSIRIkWorUyArqhMT6mwYXTEC6NtpSNjJ14dVWU9wkW2wSqOsbElvU2kUxGdQdf2+ U4Y2PEtjJJfmEXfpXHEXqjIlccXjbdm7vELprWUtpFF+voFfCRaO7dgXgysFKPyI1uvx lAx+8ETF5VcdF/6VekBoPuB4RXDPBEqgGFD4cWz1mmqdKPO1dn+kaC/KdPVIOWc6VEws jADVq6YUJhRuFFCVTQshK/7/W+jTJ28vTpA9DlwTbJc+ZomE0oJnzm7/Rqu3ehh3Y3mf OWxVAM4IyJLqJHt1csOKgeNBoyXrZuw+jshb1VrcNnxmGRpJnG34/rO8OhVSAe+3R43S Ntng== X-Gm-Message-State: AGRZ1gKVNLVVA06cZhv7+AkdcVVTFy3RugJSySVc5ryhYnMP7O+pv9FH NhhjdaYxcpBD4gT/Pb6YwLfB78r5 X-Google-Smtp-Source: AJdET5do+wfQSY2TEKdJSk7F0ayfrDLa1ohnmUgPBE0GODHIDlfRJN+IucM4JiLN161EweFgqtiq7Q== X-Received: by 2002:a2e:5159:: with SMTP id b25-v6mr4595349lje.156.1540621469432; Fri, 26 Oct 2018 23:24: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 c81-v6sm2097487lfe.79.2018.10.26.23.24.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24:28 -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/78] config.txt: move gitweb.* to a separate file Date: Sat, 27 Oct 2018 08:23:01 +0200 Message-Id: <20181027062351.30446-29-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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/config/gitweb.txt | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 Documentation/config/gitweb.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 6f4a66b3f2..99ac8fc8ec 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -337,22 +337,7 @@ include::config/gc.txt[] include::config/gitcvs.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::config/gitweb.txt[] grep.lineNumber:: If set to true, enable `-n` option by default. diff --git a/Documentation/config/gitweb.txt b/Documentation/config/gitweb.txt new file mode 100644 index 0000000000..1b51475108 --- /dev/null +++ b/Documentation/config/gitweb.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 27 06:23: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: 10658131 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 F2EE05A4 for ; Sat, 27 Oct 2018 06:24:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DFDC12BF74 for ; Sat, 27 Oct 2018 06:24:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D47DA2BF90; Sat, 27 Oct 2018 06:24:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-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 744DB2BF74 for ; Sat, 27 Oct 2018 06:24:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728455AbeJ0PE1 (ORCPT ); Sat, 27 Oct 2018 11:04:27 -0400 Received: from mail-lf1-f67.google.com ([209.85.167.67]:33842 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728417AbeJ0PEZ (ORCPT ); Sat, 27 Oct 2018 11:04:25 -0400 Received: by mail-lf1-f67.google.com with SMTP id n26-v6so2495204lfl.1 for ; Fri, 26 Oct 2018 23:24:31 -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=rlYYof9FY3FhCHsoTeOe9UWUQPHGi/7JNYHj7JPUmxY=; b=sUHG/Jj94jI09leXNdonYJ8flx2Tnlr9XyMotUy4G773iEtHb5FG9uBGVudrK1pgKr yG84sLaF/V1RHKYhEK2ygZcKdpuMeNgbU3Szx3wcpPXYDd5n1KWbkOa0bKnQ50bDgr8x VCn454ODVK3RuNUHvKSEqquuxLyma+Y7rLvvzkdnrdWI0Vlb8QwNRbGYHgifzHdyL6Ua Z6fFy7HGvmKUAUutKfxSmRbjCYxA6uK+Aftv3TZkRGI0lP3eyyJN+hG+Z1FctFWGaqKJ IoZoqSeP2nfmVyeABehQqOAlbafma8/sPjcbdZL7m/TgkYq/CJow/GTF1a3r6/SRVasE kO5w== 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=rlYYof9FY3FhCHsoTeOe9UWUQPHGi/7JNYHj7JPUmxY=; b=jNFbjwkGbLCKmicoB+/i/yQ2PQ+YeAtDJ4viK5pEi1uQOpQR5zMiZVsDpuGna2Hf+l ku8gZ+K9dyvQVIY8Z8vr8DeZZrrLpRTo3pUeiyjMpCAldsbndCV4q1b5fG7Zu/C9ua0g be1B9BDVwVGKgziWZa4KI3UjYLOvOI4DBLUR4qpbaiVStIte9+pXCFXzxKQptR/f3w1r Ud7sYymCU31GYtB9rXDdlLHFuxC3bo/I0JbR76LJpTY9uen2f2PffzmJH5/Z78kZAIzs 5EYMxhCqHbX5zuIddLuUpOwCKXS8vaRshebfvaHNkmGTpNXxiv+KfFXJJxTD+7L2q6y2 Iu8A== X-Gm-Message-State: AGRZ1gInk+ANFLTvtCVrnN87gjPIprSu3BmZaLOhtO6w2AgLUBywxk/R vTL1v0mwfxqlUxjDDTtU/aRtkein X-Google-Smtp-Source: AJdET5cDTP4NgEvCjN/uH/YXtrxsB1ExazPKobxC2HYgSF981X5UwbMQnGAk39Yw3VNByPz6GMLulQ== X-Received: by 2002:a19:d612:: with SMTP id n18-v6mr3675605lfg.4.1540621470505; Fri, 26 Oct 2018 23:24:30 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id c81-v6sm2097487lfe.79.2018.10.26.23.24.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24: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 29/78] config.txt: move grep.* to a separate file Date: Sat, 27 Oct 2018 08:23:02 +0200 Message-Id: <20181027062351.30446-30-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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/config/grep.txt | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 24 deletions(-) create mode 100644 Documentation/config/grep.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 99ac8fc8ec..177fefc83c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -339,30 +339,7 @@ include::config/gitcvs.txt[] include::config/gitweb.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::config/grep.txt[] gpg.program:: Use this custom program instead of "`gpg`" found on `$PATH` when diff --git a/Documentation/config/grep.txt b/Documentation/config/grep.txt new file mode 100644 index 0000000000..44abe45a7c --- /dev/null +++ b/Documentation/config/grep.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 27 06:23: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: 10658141 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 051065A4 for ; Sat, 27 Oct 2018 06:24:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E53F62BF74 for ; Sat, 27 Oct 2018 06:24:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D9A702BF90; Sat, 27 Oct 2018 06:24:42 +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 7439B2BF74 for ; Sat, 27 Oct 2018 06:24:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728453AbeJ0PE1 (ORCPT ); Sat, 27 Oct 2018 11:04:27 -0400 Received: from mail-lf1-f67.google.com ([209.85.167.67]:37864 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728445AbeJ0PE0 (ORCPT ); Sat, 27 Oct 2018 11:04:26 -0400 Received: by mail-lf1-f67.google.com with SMTP id a82-v6so2480089lfa.4 for ; Fri, 26 Oct 2018 23:24:32 -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=l5mRZPfwgjmfbGi4n8u3waq2MmmcAtOISyvpNXWB+yk=; b=ESC5hPU7J10hq1tk3o+k8ZZMD20YOq0TdNllqNeSeTgvDF+ILbYcrpRNs/FARyH4oW D19Fv0ssPLGuzLr7AAwfV/pz2DO3WkS9qtm/2w0nVnsrV1wFHC9bZ3dDu6xH2sfUGvq5 QQsjK6Hf3/lhSLdbWOVp8yTZuaKGh8IJwPy/tMZ5Igys/1dsRLACJcTzGV9g28ycr77v qnngQhF0HDQwcnkqE6OnLwpx8bFRNc3DgQzTagdbCKacCkD6DdcsFyqLmOpfeU8D3wtP B6eaSbn+CoXYqADmS84u7jFgjFOv4TNjeNPOQxtzXIVxhWibFa1s+OvRT/aVvnRj+kkX O+fQ== 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=l5mRZPfwgjmfbGi4n8u3waq2MmmcAtOISyvpNXWB+yk=; b=ezPPI7fDnA0iMppTseCyM7xo30Sxf1QcLKyA+9bYniK4umkxqr21T9FZOSG/kpNfvt Qjq+3iwvv2sPOxYx6DXvrlVWZi/UaIrvqny7YgjUtsssuqv61mzzreMsgr9stPZQkVtO RWH9P8XpDbuJjlZ0ZN6w8jPL+EnABCWBNQ4qjNVvuFoG1qK0EmtA1W2y1Qivg++Z7Cj+ H5/uW4rduPnx7U5B3jjwkfpBthOZhezCLvkr1UwgPMFusUeZ4DnPXiofXR0wY7nA0nkp WNkAhW7xyTenCnNLpHQgT4AWUYjnD+y062rKz7kgrG2s3U48drAkQuqogzz/vZOKTwz0 hC/g== X-Gm-Message-State: AGRZ1gJm0T3aukgPmedyr8O3T7kafHywLvM/aZXoYuhFgxvMSs6t+zKP YPNYTNpJBJBPUuUugK0XLlgJiSOj X-Google-Smtp-Source: AJdET5cwFwo0O7/sU8F8o/QFmHZzDycdjvyas3KqJZU5utjdr1Y/hM2fK0nBjgMB0Oyk9i/io7jDsQ== X-Received: by 2002:a19:cd8e:: with SMTP id d136mr3692457lfg.3.1540621471514; Fri, 26 Oct 2018 23:24:31 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id c81-v6sm2097487lfe.79.2018.10.26.23.24.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24:30 -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/78] config.txt: move gpg.* to a separate file Date: Sat, 27 Oct 2018 08:23:03 +0200 Message-Id: <20181027062351.30446-31-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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/config/gpg.txt | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 20 deletions(-) create mode 100644 Documentation/config/gpg.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 177fefc83c..f52b89883d 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -341,26 +341,7 @@ include::config/gitweb.txt[] include::config/grep.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::config/gpg.txt[] include::gui-config.txt[] diff --git a/Documentation/config/gpg.txt b/Documentation/config/gpg.txt new file mode 100644 index 0000000000..590fe0d4ba --- /dev/null +++ b/Documentation/config/gpg.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 27 06:23: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: 10658133 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 12B295A4 for ; Sat, 27 Oct 2018 06:24:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F3AA52BF74 for ; Sat, 27 Oct 2018 06:24:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E83EF2BF90; Sat, 27 Oct 2018 06:24: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 9CE632BF74 for ; Sat, 27 Oct 2018 06:24:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728458AbeJ0PE3 (ORCPT ); Sat, 27 Oct 2018 11:04:29 -0400 Received: from mail-lj1-f194.google.com ([209.85.208.194]:35026 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728216AbeJ0PE2 (ORCPT ); Sat, 27 Oct 2018 11:04:28 -0400 Received: by mail-lj1-f194.google.com with SMTP id o14-v6so3123648ljj.2 for ; Fri, 26 Oct 2018 23:24: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=6Rf067jb9wDJqA5NvqPK2nKhSZiVpiq7BdzEb4qP1Sk=; b=p5EPoMtD9u/AM4POnyiO0ebNDoCV+ioNDc2EJ2zoOSCJc3GRqgS2PjcJPn+w+qAHH7 ypCt+G9RNB38fN3z5jVZLIcvFPGQGoZaL3z6bmv8Z/SwK5doOubtEjRSRKx5P/0JhYvN HvdjL0RuAysqTGcePiM3mCSLnsUf9hFfi3RpT0oqwwFeIkNs9YmDTbnTbJ9jSzgWCRul UI+Fzr7xcPQKNR5mw7RJxcCUqZyxGu+0nzgdtNtlyLo/fDPeNhQ25xmXFgT0625rvqEF XApnz2h5rlvWyUs12WQYmjd3F28bxiA95wPDZdqtR4rtZUQZeEVtabGBPXOt8A0wMMLm GCFQ== 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=6Rf067jb9wDJqA5NvqPK2nKhSZiVpiq7BdzEb4qP1Sk=; b=Mn8cuAW604GaTv98JamfU0YOL+uZ2U/ow1/xuOxDg4faA2r0HSIvI3w7EMYUWAooQc Vb1V9Z2wajgHD0VeVNA6k/YNI+/OYSBGT1SSXI7KgN1YayJb6fePbLVH4lbDGPgnHyvM RlZagEp7w/hn/ppl2JpW2A4rPQAllxoIM/1E26Ks83WV5/j4hXSGUPrP7TtZh0TPSCen e32rcCKiv85Wu65CQBVXpgt9Aq4d4f1etpYKcVPsge/GTbgWce30snWxzBcIMSVabtbB iU1PCigBUd/Nu3pknu69o085T5IH/h10Brkon4icKRNawn6kSsEbVW1oAPVegFdjF137 Tc1w== X-Gm-Message-State: AGRZ1gKeuQkCNL/CXIk6V91xRL8Yaxtty8VOX2i0rWK6rIp5hcIsaDPY bxO/0I0BkkCHtoP5QxYouOpuRDch X-Google-Smtp-Source: AJdET5fbsnoyuL3YypIoXV0lal58LilngHC1IeqPPArSVADDb8soatJsJ/MBUXCqqVs4BnwN2OI+/g== X-Received: by 2002:a2e:7f14:: with SMTP id a20-v6mr4086894ljd.148.1540621472489; Fri, 26 Oct 2018 23:24: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 c81-v6sm2097487lfe.79.2018.10.26.23.24.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24: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 31/78] config.txt: move gui-config.txt to config/ Date: Sat, 27 Oct 2018 08:23:04 +0200 Message-Id: <20181027062351.30446-32-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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 | 2 +- Documentation/{gui-config.txt => config/gui.txt} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename Documentation/{gui-config.txt => config/gui.txt} (100%) diff --git a/Documentation/config.txt b/Documentation/config.txt index f52b89883d..093a71e5d1 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -343,7 +343,7 @@ include::config/grep.txt[] include::config/gpg.txt[] -include::gui-config.txt[] +include::config/gui.txt[] guitool..cmd:: Specifies the shell command line to execute when the corresponding item diff --git a/Documentation/gui-config.txt b/Documentation/config/gui.txt similarity index 100% rename from Documentation/gui-config.txt rename to Documentation/config/gui.txt From patchwork Sat Oct 27 06:23: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: 10658135 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 C8A3A5A4 for ; Sat, 27 Oct 2018 06:24:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B23632BF74 for ; Sat, 27 Oct 2018 06:24:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A69472BF90; Sat, 27 Oct 2018 06:24: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 2C9162BF74 for ; Sat, 27 Oct 2018 06:24:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728461AbeJ0PEa (ORCPT ); Sat, 27 Oct 2018 11:04:30 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:39204 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728417AbeJ0PE2 (ORCPT ); Sat, 27 Oct 2018 11:04:28 -0400 Received: by mail-lj1-f195.google.com with SMTP id a28-v6so82296ljd.6 for ; Fri, 26 Oct 2018 23:24:34 -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=Qp2fBJjjIsrsxpWd2IOIqlK7/Ctv5GdpBjMWlrNpPQg=; b=ahfvBQUZccop95qKlDVpXmtMF+/RWoSeUqU3sLoNkZtf58OylviC3fUoq7WCqJ7rVJ c6Few/JIvHOFipJfilcglrSTBDefImfeZicFLddYvzjkV+e+5Pqkq2WYqOOncOHgDkU0 G9SDJiC/sGeo3wyQG9i1j02TFuTyv9QW++RIpbiTfEIbpAE7YoEHKFkQpfhg8qs/pL+T gsnLfH0RCCpLP5FXpIJ1Ia1ovs2v2isPjsZv6WQWQtJJ/3b/FN7XzTHMWONS3WCLS2Vb DS1zV0zlNqAlI/zAeY0sHCuo54HPvijdrnWv0Oc2L323OP1yXOUzxq5FGcvM2KmNmjGk CcLg== 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=Qp2fBJjjIsrsxpWd2IOIqlK7/Ctv5GdpBjMWlrNpPQg=; b=PzM4Uhrq6r/HQ/5VaZD5BMiPmXDCDrLePoaov1Zv5Y7xLD73N8BXqHb+dCROHhEiDT 3y/fczqMoiEpfM5MytpxNaEqjD9HB8BxvlVT1N0Rh2hWZHgEBJlAjHI9btTNWinQI7X7 WbYgG1eFUlEjtO/J0fQaD0R2V+IdCQNNdyqYWqdJOUEvCCZ3HRUFXRCCySxM3AQFBvTL jr1P/kbbCXfdTU+E38iSs5qpNFPTOqFofzuOiiHDCW7t78S4Ksniu2GGihCuZDY1juBE hk3n65JD0aoXPCve+rchPskd34zrLBTvzYLRoFTpT5xa4LeUAF18YkJijp3iCz/giHF1 JrAw== X-Gm-Message-State: AGRZ1gKs4Khw3jlNBaXSeLu3F8AshH9LBDh0qvpW51QwvtGsvtTdVMjt O0u5c2lQjYXkB/+Xx5KWWf1Zc/h6 X-Google-Smtp-Source: AJdET5dOTtFV7yoWzqCIVcybQBTeQKv6pHQK2i8w+hZKNeRjnDEUs2hySr67TKWuCStM67Ebpu9Nkw== X-Received: by 2002:a2e:7d10:: with SMTP id y16-v6mr4033604ljc.37.1540621473410; Fri, 26 Oct 2018 23:24:33 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id c81-v6sm2097487lfe.79.2018.10.26.23.24.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24:32 -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/78] config.txt: move guitool.* to a separate file Date: Sat, 27 Oct 2018 08:23:05 +0200 Message-Id: <20181027062351.30446-33-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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/config/guitool.txt | 50 +++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 50 deletions(-) create mode 100644 Documentation/config/guitool.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 093a71e5d1..dda5812a8a 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -345,56 +345,7 @@ include::config/gpg.txt[] include::config/gui.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::config/guitool.txt[] help.browser:: Specify the browser that will be used to display help in the diff --git a/Documentation/config/guitool.txt b/Documentation/config/guitool.txt new file mode 100644 index 0000000000..43fb9466ff --- /dev/null +++ b/Documentation/config/guitool.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 27 06:23: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: 10658137 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 459F213A4 for ; Sat, 27 Oct 2018 06:24:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 330612BF74 for ; Sat, 27 Oct 2018 06:24:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 279A82BF7B; Sat, 27 Oct 2018 06:24:39 +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 BC32F2BF91 for ; Sat, 27 Oct 2018 06:24:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728463AbeJ0PEb (ORCPT ); Sat, 27 Oct 2018 11:04:31 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:38760 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728216AbeJ0PEa (ORCPT ); Sat, 27 Oct 2018 11:04:30 -0400 Received: by mail-lj1-f195.google.com with SMTP id k11-v6so3113902lja.5 for ; Fri, 26 Oct 2018 23:24: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=tQc5uEvZzisxb2oXRlmo5DlAx8q00fmVbSP1wi/W+is=; b=clMcLGqGh6m5B2YJJy1OoIbimvk9pk0apFoVMzOxIJzQBYNZRlhXgohxbBC3NRvA6q h+Dr9IUBpVRAwNTMFVqc5//eIykwzwf/xGXxYrOQLMtuZs9as+Nz8+WWIoAyS12c79rB mJ07/XQ2aeloAboLstTIpwBaHisxP4yrTMXTF069umSLK0G+gNM5WyXoTGgvVRxJN1Ao G8VV3x161saKyn9qKJhauMRMMzxUGX7N3HIj0HFwDnGmkWnYfVI6fLiFF0AGIJmrXBf3 2xXV4LZ6CgnoI+/wXr6OSzgTOfQW+dT8Dy/z8v5ZkGDTJWXCV3aGkIkVP6ho5v4rCtx6 pdiw== 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=tQc5uEvZzisxb2oXRlmo5DlAx8q00fmVbSP1wi/W+is=; b=H33Jhi6m2a64JpD+hsbXy+rw4mk7XK57YMoe+TdHCl1RhyEphuNvESG5fOp0Zlcef1 9FrwYqbWqjWu1qQaZmboLRzak1wThIx4OiObCeKo07VqNJGqLKYSprm4O3aHt8nfUp2B Q3A1/pxniDfxPdaO46Qej6vyWR8j+fVEFC9xGEroEKz/2pL19vg8RbiB/WDr8a+J/F1y XSY1eAH03ckpRdoH3zDdjOrs67HV/7MDD/WuhfV9Dd1K0opqlRE3y0dlryGoXM0r29jO jOmx268ftE94RtAJBqt7cUsgdE4IJJRXL87Q3msvkwbV5B9gYedwzyZ/xMHBHTKMldwU UCrA== X-Gm-Message-State: AGRZ1gJFyAEFSZ5VWoRywpEmdBLsIwa4BZB8BQzU5Y/CgTO6kcRGft2Y hZYSpcoFLQKAu1Eobkpl7Ef9eHI0 X-Google-Smtp-Source: AJdET5eAbqpmGhONGuuq8Jo/ZAEaIMHexgG6t0eQQH/72Xs4NJA3zHVrrZxA7Z3ru7+ZvfY7RtVZ9A== X-Received: by 2002:a2e:5b1d:: with SMTP id p29-v6mr4156779ljb.176.1540621474529; Fri, 26 Oct 2018 23:24: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 c81-v6sm2097487lfe.79.2018.10.26.23.24.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24: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 33/78] config.txt: move help.* to a separate file Date: Sat, 27 Oct 2018 08:23:06 +0200 Message-Id: <20181027062351.30446-34-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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/config/help.txt | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 23 deletions(-) create mode 100644 Documentation/config/help.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index dda5812a8a..ba3b775fb0 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -347,29 +347,7 @@ include::config/gui.txt[] include::config/guitool.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::config/help.txt[] http.proxy:: Override the HTTP proxy, normally configured using the 'http_proxy', diff --git a/Documentation/config/help.txt b/Documentation/config/help.txt new file mode 100644 index 0000000000..224bbf5a28 --- /dev/null +++ b/Documentation/config/help.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 27 06:23: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: 10658139 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 712705A4 for ; Sat, 27 Oct 2018 06:24:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5C8AC2BF74 for ; Sat, 27 Oct 2018 06:24:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 50DC82BF90; Sat, 27 Oct 2018 06:24: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 CC4822BF74 for ; Sat, 27 Oct 2018 06:24:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728292AbeJ0PEc (ORCPT ); Sat, 27 Oct 2018 11:04:32 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:43709 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728434AbeJ0PEb (ORCPT ); Sat, 27 Oct 2018 11:04:31 -0400 Received: by mail-lj1-f196.google.com with SMTP id g26-v6so1844117lja.10 for ; Fri, 26 Oct 2018 23:24: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=C3zCsQEqJ2LLX9ca3MckC6QpjHUpIMwKFEVf9YrMHcs=; b=joJ8E6uFVfw8h9Bw3aZZeY8l9I7WWEp7Y1aVflcbyVkVwOvOguJaBS+/OyxqJLqPC8 7w3mRV+k/fZF6Peq+RHUSvysb85qyAvP05ya0rZ1JNaJv3I7ydRp4xU3rVEZAXutW0dV CPdDr2fuvYpRVMs3YiSvnGv47v3ha5M5KLgUyIq2PJu12QliD/pz18GhzSFgO1rJB4hb iQgLd16zVo7H2aHAMyZGJUK4EblK8CQ2OBTmfpSBP3/PapmUeiRq49dasQYiqUUBlw9I xAR7mZMb6CbQvrwFos3TreXIPsUO/VJCvUwXJCWYHo0jk5atj0olDl0X2dS+kqtWsuLO 8SDw== 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=C3zCsQEqJ2LLX9ca3MckC6QpjHUpIMwKFEVf9YrMHcs=; b=svCk1UI9N9XOCQbg6s0X/PXIKxapa0HkfDmY8/3LmQMaIKjJwrwdKXyzls8wgWd2Pr 66mCyF5iMqy5ZC+iQfsHaIf6lOXO7z1fqVUddPcjKoE9kfqNWFeqhMtTx+VHjdyLW+YM BvsUd6TvuXjIb6wiLmQZSAy5tZ5RE1fM/iWHGwbWKRcbdi8D815rc2UK+Hxc0sGCVRUD +ooz51G1E2OWwPheqR/y2OZooyByFZXc0kTBhpTvpK/Mjx629gII73CSxRNX3BrK0dV4 EqNSRgvSwZVpr40RnBFZb+f2P1K44Sjp8U34giOiPNPMXWgsb4Fjj1R6oPg0OzybXmDH Nb6A== X-Gm-Message-State: AGRZ1gLTemJOArI1tjA3C7RS5D48V7NWTiQjdyu78nKWXMh9c2V5t5oA HTFYukgktBjNHz3v+1hv9yBQavSt X-Google-Smtp-Source: AJdET5eVweDZ0/J5FhnhPYVnn3CCrIr+GwlFd0vW0Mnm9cbkd/15eVIFASla08Y3slBI/Rwl4QIPwA== X-Received: by 2002:a2e:3e0b:: with SMTP id l11-v6mr4586403lja.16.1540621475545; Fri, 26 Oct 2018 23:24: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 c81-v6sm2097487lfe.79.2018.10.26.23.24.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24: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 34/78] config.txt: move ssh.* to a separate file Date: Sat, 27 Oct 2018 08:23:07 +0200 Message-Id: <20181027062351.30446-35-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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/config/ssh.txt | 35 +++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 36 deletions(-) create mode 100644 Documentation/config/ssh.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index ba3b775fb0..60c2204fb4 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -621,42 +621,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 @@ -1298,6 +1262,8 @@ splitIndex.sharedIndexExpire:: either created based on it or read from it. See linkgit:git-update-index[1]. +include::config/ssh.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/config/ssh.txt b/Documentation/config/ssh.txt new file mode 100644 index 0000000000..2ca4bf93e1 --- /dev/null +++ b/Documentation/config/ssh.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 27 06:23: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: 10658145 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 5CA5F13A4 for ; Sat, 27 Oct 2018 06:24:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 464802BF74 for ; Sat, 27 Oct 2018 06:24:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3AE762BF7B; Sat, 27 Oct 2018 06:24:45 +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 8B2432BF90 for ; Sat, 27 Oct 2018 06:24:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728470AbeJ0PEg (ORCPT ); Sat, 27 Oct 2018 11:04:36 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:38763 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727973AbeJ0PEf (ORCPT ); Sat, 27 Oct 2018 11:04:35 -0400 Received: by mail-lj1-f196.google.com with SMTP id k11-v6so3113949lja.5 for ; Fri, 26 Oct 2018 23:24:38 -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=A1R7jgjH/mQMjuNtop0dsRB7++I5Y7UlbIyEFc4ZrXk=; b=PcoJRBfkzLdXXRV2oODkJShUYBSJpwvAZbk7blJobAg7az+MDA4jfNtEZRXbgcc14A XmzjIay/VEzzp2jplSwqfvcBgdKqbKMSGNDwBEIUM00Z4DoKh13BCBd5gZosct4LSMPG +/9eWr0/MjbnFSd2MRA0vit8YIxIQ0/La+gmv9UgfddAWKyiGAsJaoE11OvTYvQzo5Hn CZVZMclq3Psthewusxn8JLk8QWdNs4rJzRBy00koi8D11Dky/2w5Fq86tnzgGw+XjkPc 5tDFLG/tjyY97R2MB4jhJ1bmYPjh6NQC7PPXCRuDGebTCChfjevjX42tzxSqTPqQBnzK ZrgQ== 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=A1R7jgjH/mQMjuNtop0dsRB7++I5Y7UlbIyEFc4ZrXk=; b=bc7g2/81/6OPr2gmbwePSEd/aCwVkloXVSuetUaIKmioPCVIRTCWMxOLpIBlWIY4l8 b26o1o8qf06m34z2+u4pB8cU2aLy1q4bkVDhF1dwxjuqTyTwBf+G4uMHcwymGW0PXIB0 x9karODTPzQpfg3Bv2RfsO8VUTcndNuo2H6iXuxTTRobYPSHwtUw6dFJrAxCgXbwbw0w NmqR2D7469lfZCN8qW7W7Xr4xrkOgMTV4x0TNwz3E09v7cMJbGhDqtCCdoHvVEOPdXnQ IhI8NU1E/V9SakvBO7r35fMim7oSKWCVXzMb5qfhOI/IqJkctMvTdllJ3QFT6Vrn4taE KgTw== X-Gm-Message-State: AGRZ1gIyexhmSJdkBakqpIEVL6nI2Fh2IDxWLPliGKSEC4uYj10ud3i8 bu8gj9xbhIsva0+kebQyjBcYOs1f X-Google-Smtp-Source: AJdET5cOnVfZ+WvCSxkoUX+mfhu7psx+1ZS4ykxVL/Dhx6qWDWHxlbTai6wt6ag9dfbk5apltZ2Agw== X-Received: by 2002:a2e:92ca:: with SMTP id k10-v6mr4122268ljh.103.1540621477104; Fri, 26 Oct 2018 23:24:37 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id c81-v6sm2097487lfe.79.2018.10.26.23.24.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24:35 -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/78] config.txt: move http.* to a separate file Date: Sat, 27 Oct 2018 08:23:08 +0200 Message-Id: <20181027062351.30446-36-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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 | 272 +--------------------------------- Documentation/config/http.txt | 271 +++++++++++++++++++++++++++++++++ 2 files changed, 272 insertions(+), 271 deletions(-) create mode 100644 Documentation/config/http.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 60c2204fb4..11194e1851 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -349,277 +349,7 @@ include::config/guitool.txt[] include::config/help.txt[] -http.proxy:: - Override the HTTP proxy, normally configured using the 'http_proxy', - 'https_proxy', and 'all_proxy' environment variables (see `curl(1)`). In - addition to the syntax understood by curl, it is possible to specify a - proxy string with a user name but no password, in which case git will - attempt to acquire one in the same way it does for other credentials. See - linkgit:gitcredentials[7] for more information. The syntax thus is - '[protocol://][user[:password]@]proxyhost[:port]'. This can be overridden - on a per-remote basis; see remote..proxy - -http.proxyAuthMethod:: - Set the method with which to authenticate against the HTTP proxy. This - only takes effect if the configured proxy string contains a user name part - (i.e. is of the form 'user@host' or 'user@host:port'). This can be - overridden on a per-remote basis; see `remote..proxyAuthMethod`. - Both can be overridden by the `GIT_HTTP_PROXY_AUTHMETHOD` environment - variable. Possible values are: -+ --- -* `anyauth` - Automatically pick a suitable authentication method. It is - assumed that the proxy answers an unauthenticated request with a 407 - status code and one or more Proxy-authenticate headers with supported - authentication methods. This is the default. -* `basic` - HTTP Basic authentication -* `digest` - HTTP Digest authentication; this prevents the password from being - transmitted to the proxy in clear text -* `negotiate` - GSS-Negotiate authentication (compare the --negotiate option - of `curl(1)`) -* `ntlm` - NTLM authentication (compare the --ntlm option of `curl(1)`) --- - -http.emptyAuth:: - Attempt authentication without seeking a username or password. This - can be used to attempt GSS-Negotiate authentication without specifying - a username in the URL, as libcurl normally requires a username for - authentication. - -http.delegation:: - Control GSSAPI credential delegation. The delegation is disabled - by default in libcurl since version 7.21.7. Set parameter to tell - the server what it is allowed to delegate when it comes to user - credentials. Used with GSS/kerberos. Possible values are: -+ --- -* `none` - Don't allow any delegation. -* `policy` - Delegates if and only if the OK-AS-DELEGATE flag is set in the - Kerberos service ticket, which is a matter of realm policy. -* `always` - Unconditionally allow the server to delegate. --- - - -http.extraHeader:: - Pass an additional HTTP header when communicating with a server. If - more than one such entry exists, all of them are added as extra - headers. To allow overriding the settings inherited from the system - config, an empty value will reset the extra headers to the empty list. - -http.cookieFile:: - The pathname of a file containing previously stored cookie lines, - which should be used - in the Git http session, if they match the server. The file format - of the file to read cookies from should be plain HTTP headers or - the Netscape/Mozilla cookie file format (see `curl(1)`). - NOTE that the file specified with http.cookieFile is used only as - input unless http.saveCookies is set. - -http.saveCookies:: - If set, store cookies received during requests to the file specified by - http.cookieFile. Has no effect if http.cookieFile is unset. - -http.sslVersion:: - The SSL version to use when negotiating an SSL connection, if you - want to force the default. The available and default version - depend on whether libcurl was built against NSS or OpenSSL and the - particular configuration of the crypto library in use. Internally - this sets the 'CURLOPT_SSL_VERSION' option; see the libcurl - documentation for more details on the format of this option and - for the ssl version supported. Actually the possible values of - this option are: - - - sslv2 - - sslv3 - - tlsv1 - - tlsv1.0 - - tlsv1.1 - - tlsv1.2 - - tlsv1.3 - -+ -Can be overridden by the `GIT_SSL_VERSION` environment variable. -To force git to use libcurl's default ssl version and ignore any -explicit http.sslversion option, set `GIT_SSL_VERSION` to the -empty string. - -http.sslCipherList:: - A list of SSL ciphers to use when negotiating an SSL connection. - The available ciphers depend on whether libcurl was built against - NSS or OpenSSL and the particular configuration of the crypto - library in use. Internally this sets the 'CURLOPT_SSL_CIPHER_LIST' - option; see the libcurl documentation for more details on the format - of this list. -+ -Can be overridden by the `GIT_SSL_CIPHER_LIST` environment variable. -To force git to use libcurl's default cipher list and ignore any -explicit http.sslCipherList option, set `GIT_SSL_CIPHER_LIST` to the -empty string. - -http.sslVerify:: - Whether to verify the SSL certificate when fetching or pushing - over HTTPS. Defaults to true. Can be overridden by the - `GIT_SSL_NO_VERIFY` environment variable. - -http.sslCert:: - File containing the SSL certificate when fetching or pushing - over HTTPS. Can be overridden by the `GIT_SSL_CERT` environment - variable. - -http.sslKey:: - File containing the SSL private key when fetching or pushing - over HTTPS. Can be overridden by the `GIT_SSL_KEY` environment - variable. - -http.sslCertPasswordProtected:: - Enable Git's password prompt for the SSL certificate. Otherwise - OpenSSL will prompt the user, possibly many times, if the - certificate or private key is encrypted. Can be overridden by the - `GIT_SSL_CERT_PASSWORD_PROTECTED` environment variable. - -http.sslCAInfo:: - File containing the certificates to verify the peer with when - fetching or pushing over HTTPS. Can be overridden by the - `GIT_SSL_CAINFO` environment variable. - -http.sslCAPath:: - Path containing files with the CA certificates to verify the peer - with when fetching or pushing over HTTPS. Can be overridden - by the `GIT_SSL_CAPATH` environment variable. - -http.sslBackend:: - Name of the SSL backend to use (e.g. "openssl" or "schannel"). - This option is ignored if cURL lacks support for choosing the SSL - backend at runtime. - -http.schannelCheckRevoke:: - Used to enforce or disable certificate revocation checks in cURL - when http.sslBackend is set to "schannel". Defaults to `true` if - unset. Only necessary to disable this if Git consistently errors - and the message is about checking the revocation status of a - certificate. This option is ignored if cURL lacks support for - setting the relevant SSL option at runtime. - -http.schannelUseSSLCAInfo:: - As of cURL v7.60.0, the Secure Channel backend can use the - certificate bundle provided via `http.sslCAInfo`, but that would - override the Windows Certificate Store. Since this is not desirable - by default, Git will tell cURL not to use that bundle by default - when the `schannel` backend was configured via `http.sslBackend`, - unless `http.schannelUseSSLCAInfo` overrides this behavior. - -http.pinnedpubkey:: - Public key of the https service. It may either be the filename of - a PEM or DER encoded public key file or a string starting with - 'sha256//' followed by the base64 encoded sha256 hash of the - public key. See also libcurl 'CURLOPT_PINNEDPUBLICKEY'. git will - exit with an error if this option is set but not supported by - cURL. - -http.sslTry:: - Attempt to use AUTH SSL/TLS and encrypted data transfers - when connecting via regular FTP protocol. This might be needed - if the FTP server requires it for security reasons or you wish - to connect securely whenever remote FTP server supports it. - Default is false since it might trigger certificate verification - errors on misconfigured servers. - -http.maxRequests:: - How many HTTP requests to launch in parallel. Can be overridden - by the `GIT_HTTP_MAX_REQUESTS` environment variable. Default is 5. - -http.minSessions:: - The number of curl sessions (counted across slots) to be kept across - requests. They will not be ended with curl_easy_cleanup() until - http_cleanup() is invoked. If USE_CURL_MULTI is not defined, this - value will be capped at 1. Defaults to 1. - -http.postBuffer:: - Maximum size in bytes of the buffer used by smart HTTP - transports when POSTing data to the remote system. - For requests larger than this buffer size, HTTP/1.1 and - Transfer-Encoding: chunked is used to avoid creating a - massive pack file locally. Default is 1 MiB, which is - sufficient for most requests. - -http.lowSpeedLimit, http.lowSpeedTime:: - If the HTTP transfer speed is less than 'http.lowSpeedLimit' - for longer than 'http.lowSpeedTime' seconds, the transfer is aborted. - Can be overridden by the `GIT_HTTP_LOW_SPEED_LIMIT` and - `GIT_HTTP_LOW_SPEED_TIME` environment variables. - -http.noEPSV:: - A boolean which disables using of EPSV ftp command by curl. - This can helpful with some "poor" ftp servers which don't - support EPSV mode. Can be overridden by the `GIT_CURL_FTP_NO_EPSV` - environment variable. Default is false (curl will use EPSV). - -http.userAgent:: - The HTTP USER_AGENT string presented to an HTTP server. The default - value represents the version of the client Git such as git/1.7.1. - This option allows you to override this value to a more common value - such as Mozilla/4.0. This may be necessary, for instance, if - connecting through a firewall that restricts HTTP connections to a set - of common USER_AGENT strings (but not including those like git/1.7.1). - Can be overridden by the `GIT_HTTP_USER_AGENT` environment variable. - -http.followRedirects:: - Whether git should follow HTTP redirects. If set to `true`, git - will transparently follow any redirect issued by a server it - encounters. If set to `false`, git will treat all redirects as - errors. If set to `initial`, git will follow redirects only for - the initial request to a remote, but not for subsequent - follow-up HTTP requests. Since git uses the redirected URL as - the base for the follow-up requests, this is generally - sufficient. The default is `initial`. - -http..*:: - Any of the http.* options above can be applied selectively to some URLs. - For a config key to match a URL, each element of the config key is - compared to that of the URL, in the following order: -+ --- -. Scheme (e.g., `https` in `https://example.com/`). This field - must match exactly between the config key and the URL. - -. Host/domain name (e.g., `example.com` in `https://example.com/`). - This field must match between the config key and the URL. It is - possible to specify a `*` as part of the host name to match all subdomains - at this level. `https://*.example.com/` for example would match - `https://foo.example.com/`, but not `https://foo.bar.example.com/`. - -. Port number (e.g., `8080` in `http://example.com:8080/`). - This field must match exactly between the config key and the URL. - Omitted port numbers are automatically converted to the correct - default for the scheme before matching. - -. Path (e.g., `repo.git` in `https://example.com/repo.git`). The - path field of the config key must match the path field of the URL - either exactly or as a prefix of slash-delimited path elements. This means - a config key with path `foo/` matches URL path `foo/bar`. A prefix can only - match on a slash (`/`) boundary. Longer matches take precedence (so a config - key with path `foo/bar` is a better match to URL path `foo/bar` than a config - key with just path `foo/`). - -. User name (e.g., `user` in `https://user@example.com/repo.git`). If - the config key has a user name it must match the user name in the - URL exactly. If the config key does not have a user name, that - config key will match a URL with any user name (including none), - but at a lower precedence than a config key with a user name. --- -+ -The list above is ordered by decreasing precedence; a URL that matches -a config key's path is preferred to one that matches its user name. For example, -if the URL is `https://user@example.com/foo/bar` a config key match of -`https://example.com/foo` will be preferred over a config key match of -`https://user@example.com`. -+ -All URLs are normalized before attempting any matching (the password part, -if embedded in the URL, is always ignored for matching purposes) so that -equivalent URLs that are simply spelled differently will match properly. -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. +include::config/http.txt[] i18n.commitEncoding:: Character encoding the commit messages are stored in; Git itself diff --git a/Documentation/config/http.txt b/Documentation/config/http.txt new file mode 100644 index 0000000000..a56d848bc0 --- /dev/null +++ b/Documentation/config/http.txt @@ -0,0 +1,271 @@ +http.proxy:: + Override the HTTP proxy, normally configured using the 'http_proxy', + 'https_proxy', and 'all_proxy' environment variables (see `curl(1)`). In + addition to the syntax understood by curl, it is possible to specify a + proxy string with a user name but no password, in which case git will + attempt to acquire one in the same way it does for other credentials. See + linkgit:gitcredentials[7] for more information. The syntax thus is + '[protocol://][user[:password]@]proxyhost[:port]'. This can be overridden + on a per-remote basis; see remote..proxy + +http.proxyAuthMethod:: + Set the method with which to authenticate against the HTTP proxy. This + only takes effect if the configured proxy string contains a user name part + (i.e. is of the form 'user@host' or 'user@host:port'). This can be + overridden on a per-remote basis; see `remote..proxyAuthMethod`. + Both can be overridden by the `GIT_HTTP_PROXY_AUTHMETHOD` environment + variable. Possible values are: ++ +-- +* `anyauth` - Automatically pick a suitable authentication method. It is + assumed that the proxy answers an unauthenticated request with a 407 + status code and one or more Proxy-authenticate headers with supported + authentication methods. This is the default. +* `basic` - HTTP Basic authentication +* `digest` - HTTP Digest authentication; this prevents the password from being + transmitted to the proxy in clear text +* `negotiate` - GSS-Negotiate authentication (compare the --negotiate option + of `curl(1)`) +* `ntlm` - NTLM authentication (compare the --ntlm option of `curl(1)`) +-- + +http.emptyAuth:: + Attempt authentication without seeking a username or password. This + can be used to attempt GSS-Negotiate authentication without specifying + a username in the URL, as libcurl normally requires a username for + authentication. + +http.delegation:: + Control GSSAPI credential delegation. The delegation is disabled + by default in libcurl since version 7.21.7. Set parameter to tell + the server what it is allowed to delegate when it comes to user + credentials. Used with GSS/kerberos. Possible values are: ++ +-- +* `none` - Don't allow any delegation. +* `policy` - Delegates if and only if the OK-AS-DELEGATE flag is set in the + Kerberos service ticket, which is a matter of realm policy. +* `always` - Unconditionally allow the server to delegate. +-- + + +http.extraHeader:: + Pass an additional HTTP header when communicating with a server. If + more than one such entry exists, all of them are added as extra + headers. To allow overriding the settings inherited from the system + config, an empty value will reset the extra headers to the empty list. + +http.cookieFile:: + The pathname of a file containing previously stored cookie lines, + which should be used + in the Git http session, if they match the server. The file format + of the file to read cookies from should be plain HTTP headers or + the Netscape/Mozilla cookie file format (see `curl(1)`). + NOTE that the file specified with http.cookieFile is used only as + input unless http.saveCookies is set. + +http.saveCookies:: + If set, store cookies received during requests to the file specified by + http.cookieFile. Has no effect if http.cookieFile is unset. + +http.sslVersion:: + The SSL version to use when negotiating an SSL connection, if you + want to force the default. The available and default version + depend on whether libcurl was built against NSS or OpenSSL and the + particular configuration of the crypto library in use. Internally + this sets the 'CURLOPT_SSL_VERSION' option; see the libcurl + documentation for more details on the format of this option and + for the ssl version supported. Actually the possible values of + this option are: + + - sslv2 + - sslv3 + - tlsv1 + - tlsv1.0 + - tlsv1.1 + - tlsv1.2 + - tlsv1.3 + ++ +Can be overridden by the `GIT_SSL_VERSION` environment variable. +To force git to use libcurl's default ssl version and ignore any +explicit http.sslversion option, set `GIT_SSL_VERSION` to the +empty string. + +http.sslCipherList:: + A list of SSL ciphers to use when negotiating an SSL connection. + The available ciphers depend on whether libcurl was built against + NSS or OpenSSL and the particular configuration of the crypto + library in use. Internally this sets the 'CURLOPT_SSL_CIPHER_LIST' + option; see the libcurl documentation for more details on the format + of this list. ++ +Can be overridden by the `GIT_SSL_CIPHER_LIST` environment variable. +To force git to use libcurl's default cipher list and ignore any +explicit http.sslCipherList option, set `GIT_SSL_CIPHER_LIST` to the +empty string. + +http.sslVerify:: + Whether to verify the SSL certificate when fetching or pushing + over HTTPS. Defaults to true. Can be overridden by the + `GIT_SSL_NO_VERIFY` environment variable. + +http.sslCert:: + File containing the SSL certificate when fetching or pushing + over HTTPS. Can be overridden by the `GIT_SSL_CERT` environment + variable. + +http.sslKey:: + File containing the SSL private key when fetching or pushing + over HTTPS. Can be overridden by the `GIT_SSL_KEY` environment + variable. + +http.sslCertPasswordProtected:: + Enable Git's password prompt for the SSL certificate. Otherwise + OpenSSL will prompt the user, possibly many times, if the + certificate or private key is encrypted. Can be overridden by the + `GIT_SSL_CERT_PASSWORD_PROTECTED` environment variable. + +http.sslCAInfo:: + File containing the certificates to verify the peer with when + fetching or pushing over HTTPS. Can be overridden by the + `GIT_SSL_CAINFO` environment variable. + +http.sslCAPath:: + Path containing files with the CA certificates to verify the peer + with when fetching or pushing over HTTPS. Can be overridden + by the `GIT_SSL_CAPATH` environment variable. + +http.sslBackend:: + Name of the SSL backend to use (e.g. "openssl" or "schannel"). + This option is ignored if cURL lacks support for choosing the SSL + backend at runtime. + +http.schannelCheckRevoke:: + Used to enforce or disable certificate revocation checks in cURL + when http.sslBackend is set to "schannel". Defaults to `true` if + unset. Only necessary to disable this if Git consistently errors + and the message is about checking the revocation status of a + certificate. This option is ignored if cURL lacks support for + setting the relevant SSL option at runtime. + +http.schannelUseSSLCAInfo:: + As of cURL v7.60.0, the Secure Channel backend can use the + certificate bundle provided via `http.sslCAInfo`, but that would + override the Windows Certificate Store. Since this is not desirable + by default, Git will tell cURL not to use that bundle by default + when the `schannel` backend was configured via `http.sslBackend`, + unless `http.schannelUseSSLCAInfo` overrides this behavior. + +http.pinnedpubkey:: + Public key of the https service. It may either be the filename of + a PEM or DER encoded public key file or a string starting with + 'sha256//' followed by the base64 encoded sha256 hash of the + public key. See also libcurl 'CURLOPT_PINNEDPUBLICKEY'. git will + exit with an error if this option is set but not supported by + cURL. + +http.sslTry:: + Attempt to use AUTH SSL/TLS and encrypted data transfers + when connecting via regular FTP protocol. This might be needed + if the FTP server requires it for security reasons or you wish + to connect securely whenever remote FTP server supports it. + Default is false since it might trigger certificate verification + errors on misconfigured servers. + +http.maxRequests:: + How many HTTP requests to launch in parallel. Can be overridden + by the `GIT_HTTP_MAX_REQUESTS` environment variable. Default is 5. + +http.minSessions:: + The number of curl sessions (counted across slots) to be kept across + requests. They will not be ended with curl_easy_cleanup() until + http_cleanup() is invoked. If USE_CURL_MULTI is not defined, this + value will be capped at 1. Defaults to 1. + +http.postBuffer:: + Maximum size in bytes of the buffer used by smart HTTP + transports when POSTing data to the remote system. + For requests larger than this buffer size, HTTP/1.1 and + Transfer-Encoding: chunked is used to avoid creating a + massive pack file locally. Default is 1 MiB, which is + sufficient for most requests. + +http.lowSpeedLimit, http.lowSpeedTime:: + If the HTTP transfer speed is less than 'http.lowSpeedLimit' + for longer than 'http.lowSpeedTime' seconds, the transfer is aborted. + Can be overridden by the `GIT_HTTP_LOW_SPEED_LIMIT` and + `GIT_HTTP_LOW_SPEED_TIME` environment variables. + +http.noEPSV:: + A boolean which disables using of EPSV ftp command by curl. + This can helpful with some "poor" ftp servers which don't + support EPSV mode. Can be overridden by the `GIT_CURL_FTP_NO_EPSV` + environment variable. Default is false (curl will use EPSV). + +http.userAgent:: + The HTTP USER_AGENT string presented to an HTTP server. The default + value represents the version of the client Git such as git/1.7.1. + This option allows you to override this value to a more common value + such as Mozilla/4.0. This may be necessary, for instance, if + connecting through a firewall that restricts HTTP connections to a set + of common USER_AGENT strings (but not including those like git/1.7.1). + Can be overridden by the `GIT_HTTP_USER_AGENT` environment variable. + +http.followRedirects:: + Whether git should follow HTTP redirects. If set to `true`, git + will transparently follow any redirect issued by a server it + encounters. If set to `false`, git will treat all redirects as + errors. If set to `initial`, git will follow redirects only for + the initial request to a remote, but not for subsequent + follow-up HTTP requests. Since git uses the redirected URL as + the base for the follow-up requests, this is generally + sufficient. The default is `initial`. + +http..*:: + Any of the http.* options above can be applied selectively to some URLs. + For a config key to match a URL, each element of the config key is + compared to that of the URL, in the following order: ++ +-- +. Scheme (e.g., `https` in `https://example.com/`). This field + must match exactly between the config key and the URL. + +. Host/domain name (e.g., `example.com` in `https://example.com/`). + This field must match between the config key and the URL. It is + possible to specify a `*` as part of the host name to match all subdomains + at this level. `https://*.example.com/` for example would match + `https://foo.example.com/`, but not `https://foo.bar.example.com/`. + +. Port number (e.g., `8080` in `http://example.com:8080/`). + This field must match exactly between the config key and the URL. + Omitted port numbers are automatically converted to the correct + default for the scheme before matching. + +. Path (e.g., `repo.git` in `https://example.com/repo.git`). The + path field of the config key must match the path field of the URL + either exactly or as a prefix of slash-delimited path elements. This means + a config key with path `foo/` matches URL path `foo/bar`. A prefix can only + match on a slash (`/`) boundary. Longer matches take precedence (so a config + key with path `foo/bar` is a better match to URL path `foo/bar` than a config + key with just path `foo/`). + +. User name (e.g., `user` in `https://user@example.com/repo.git`). If + the config key has a user name it must match the user name in the + URL exactly. If the config key does not have a user name, that + config key will match a URL with any user name (including none), + but at a lower precedence than a config key with a user name. +-- ++ +The list above is ordered by decreasing precedence; a URL that matches +a config key's path is preferred to one that matches its user name. For example, +if the URL is `https://user@example.com/foo/bar` a config key match of +`https://example.com/foo` will be preferred over a config key match of +`https://user@example.com`. ++ +All URLs are normalized before attempting any matching (the password part, +if embedded in the URL, is always ignored for matching purposes) so that +equivalent URLs that are simply spelled differently will match properly. +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. From patchwork Sat Oct 27 06:23: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: 10658143 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 A9C0D13A4 for ; Sat, 27 Oct 2018 06:24:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 96E2D2BF74 for ; Sat, 27 Oct 2018 06:24:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8B7B62BF91; Sat, 27 Oct 2018 06:24:43 +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 34C2E2BF74 for ; Sat, 27 Oct 2018 06:24:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728464AbeJ0PEf (ORCPT ); Sat, 27 Oct 2018 11:04:35 -0400 Received: from mail-lj1-f194.google.com ([209.85.208.194]:37282 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728295AbeJ0PEe (ORCPT ); Sat, 27 Oct 2018 11:04:34 -0400 Received: by mail-lj1-f194.google.com with SMTP id c4-v6so3111815lja.4 for ; Fri, 26 Oct 2018 23:24: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=E8im2AWO3PkP4LFNtmSQdnUqLhYqgZ7AiD/ofFFXNkc=; b=sZG+nriA1FPf2n+FhW+h1J/ox6SNURVW/UEimHWomLzY+QAsS99f2fc/V39SxbLo/N opdF7PEvFap9SDXaN2rBLdAWD0Isn994Vxgj8OkXH0SEpwslBq0m7Q/SctkyqxoUr8LN c7QgxrVD3FwuZwoy6YHDNnV4dt051hMhVN8hffXnw5vGBJhQMvMz1O0n1GjQlhp0R7yC HUHPC7v4MqBSFy4flhXYC4PKYclqEbjNzEc+x85QWmuJEGpDbCFh0lk+OjL+PFZk9m4b 9SjHlVqtJ6c7IvTM25H+5qlfuTlaHXfXnuvXjMRNaLRZ1xFWTFi+TT2t9vS7k0V1uwJe /fog== 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=E8im2AWO3PkP4LFNtmSQdnUqLhYqgZ7AiD/ofFFXNkc=; b=WYptB5GS0dF5djJMimWPBJA1GhATJbSWuBZ/GJ14vkE1INtzNtoOBLNAGoEEntajVn /F6CU4vwGT/echI9YgG/3sSWrRA5lRPeBUfYwAWweS58gvlxgl+VSVf/hl6suDPYnAjy jrCoK0mMkuS115/pl6hqTaRaEcloC6kubAJB0FwMPTOV9uzbZpaHDpkS/5z9PQ0SGytO PpZNW0qbUEdUhke0g6+DTG3IfJVvZqCopdXWyvnMSlpUrhKmV8865RNm8v8h8I1LjC4+ iUA1Pw48Hx+7L89/P+wQK6A9vNQ8g+IKjjObntbridhsSbkqKO6tACHLsev87qn9T01S WI+w== X-Gm-Message-State: AGRZ1gLnmn+J7s3ikghdOHeEqXZ9JxTGOOIyIjst0vQrpmVfLgNvoCxK bVqiBEbV0ayCLsS6sGHSaiWDBiIR X-Google-Smtp-Source: AJdET5eUHTD1bNLsRaUEizdlZou3s448Xpbt6004yg46cxOF1Du6T0FivqYZ24QP/x7r9vHiVscInA== X-Received: by 2002:a2e:8e95:: with SMTP id z21-v6mr2966565ljk.166.1540621478927; Fri, 26 Oct 2018 23:24: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 c81-v6sm2097487lfe.79.2018.10.26.23.24.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24: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 36/78] config.txt: move i18n.* to a separate file Date: Sat, 27 Oct 2018 08:23:09 +0200 Message-Id: <20181027062351.30446-37-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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/config/i18n.txt | 10 ++++++++++ 2 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 Documentation/config/i18n.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 11194e1851..a44e717f30 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -351,16 +351,7 @@ include::config/help.txt[] include::config/http.txt[] -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::config/i18n.txt[] imap:: The configuration variables in the 'imap' section are described diff --git a/Documentation/config/i18n.txt b/Documentation/config/i18n.txt new file mode 100644 index 0000000000..cc25621731 --- /dev/null +++ b/Documentation/config/i18n.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 27 06:23: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: 10658147 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 AD1555A4 for ; Sat, 27 Oct 2018 06:24:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9A8A72BF74 for ; Sat, 27 Oct 2018 06:24:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8F5D62BF90; Sat, 27 Oct 2018 06:24:47 +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 106F62BF74 for ; Sat, 27 Oct 2018 06:24:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728215AbeJ0PEj (ORCPT ); Sat, 27 Oct 2018 11:04:39 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:33330 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728290AbeJ0PEg (ORCPT ); Sat, 27 Oct 2018 11:04:36 -0400 Received: by mail-lj1-f195.google.com with SMTP id z21-v6so3126519ljz.0 for ; Fri, 26 Oct 2018 23:24:41 -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=vjBGHI4sDjINRh6JDGoNi1ZHRFlbsQ9tN6VwxwKCzC4=; b=YjYZMndsllmAKz7t3G1tc28+jbT2TKR1M+KktY6cRopLcLNVSrf5dDd5b/ZBZkR6kT 4evY32as1PTX/Lz4reIl2Lm8yyXfDKZkmEk/uhWTXsXnz0bO3OJF7dDeEVkSALMRKLNy HPctPrZAYzWLVyb+23+9rVyphpfd2t48yYj7GGBzmJ8lsZoDUwIkfnDg01mWd89wGvjd NUJ+Cn2DGN7geBEtTHtJnQHXeWLu/WZbIOq3GRWImVnRp1ZnlS7Gh2wQeXt2D1TIT4xv laRg3/4WwHGamc3UZp51ofuN0XXmI2FSHd+F26cMMmkv+lq1vHF936f9etV6EusI9aMr x+ZQ== 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=vjBGHI4sDjINRh6JDGoNi1ZHRFlbsQ9tN6VwxwKCzC4=; b=sNwQslSjFuOvQrCwlE4rPsm4qbZHbNXJ3O389QgAxFVg/arpLcdvu4MHsUE6e3kfrj +73KS8sASXRBWxcUpzuRPUjQ8T5yRybrtcKE73UZeokYpwixNpD0foZYX0/PI80jqUPS 4Uu8gq19K/7L3bAn+UDz79ElUkrPmk5rhsJgPf2dFb9l4faSARtqhOEvc76uvKo9DQI1 uRsxzz469a9yml/4XBlDvL6fFL/ZAH+O9xNQH5jW/vG4xc570RWOt8ZMtzvAXhxy5Ogc ajoOcx+tlFxe3Oha/5j/xviGbCHf1wuYTDg91wafqLg8zvXkOk9RUsLJwwuPQQdB9KG6 ljkQ== X-Gm-Message-State: AGRZ1gKhyDWQYz5Cdtl+KwPMT1HbsoC2GnC5Peppsa0eZACpDFXWk20O rz52Arr8APFJBrLXs6+RAPUpIlBF X-Google-Smtp-Source: AJdET5efR/SF6JVWFb28fUzy/ArJ9L2C5RAFN/lPZ30Xtq03WDx+IzRirBpyiUkTZm5E0VSZQkv/aQ== X-Received: by 2002:a2e:c52:: with SMTP id o18-v6mr4164593ljd.94.1540621480064; Fri, 26 Oct 2018 23:24:40 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id c81-v6sm2097487lfe.79.2018.10.26.23.24.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 23:24:39 -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/78] git-imap-send.txt: move imap.* to a separate file Date: Sat, 27 Oct 2018 08:23:10 +0200 Message-Id: <20181027062351.30446-38-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com> References: <20181027062351.30446-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/config/imap.txt | 44 ++++++++++++++++++++++++++++++++ Documentation/git-imap-send.txt | 45 +-------------------------------- 3 files changed, 46 insertions(+), 47 deletions(-) create mode 100644 Documentation/config/imap.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index a44e717f30..d26656df95 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -353,9 +353,7 @@ include::config/http.txt[] include::config/i18n.txt[] -imap:: - The configuration variables in the 'imap' section are described - in linkgit:git-imap-send[1]. +include::config/imap.txt[] index.threads:: Specifies the number of threads to spawn when loading the index. diff --git a/Documentation/config/imap.txt b/Documentation/config/imap.txt new file mode 100644 index 0000000000..06166fb5c0 --- /dev/null +++ b/Documentation/config/imap.txt @@ -0,0 +1,44 @@ +imap.folder:: + The folder to drop the mails into, which is typically the Drafts + folder. For example: "INBOX.Drafts", "INBOX/Drafts" or + "[Gmail]/Drafts". Required. + +imap.tunnel:: + Command used to setup a tunnel to the IMAP server through which + commands will be piped instead of using a direct network connection + to the server. Required when imap.host is not set. + +imap.host:: + A URL identifying the server. Use an `imap://` prefix for non-secure + connections and an `imaps://` prefix for secure connections. + Ignored when imap.tunnel is set, but required otherwise. + +imap.user:: + The username to use when logging in to the server. + +imap.pass:: + The password to use when logging in to the server. + +imap.port:: + An integer port number to connect to on the server. + Defaults to 143 for imap:// hosts and 993 for imaps:// hosts. + Ignored when imap.tunnel is set. + +imap.sslverify:: + A boolean to enable/disable verification of the server certificate + used by the SSL/TLS connection. Default is `true`. Ignored when + imap.tunnel is set. + +imap.preformattedHTML:: + A boolean to enable/disable the use of html encoding when sending + a patch. An html encoded patch will be bracketed with 
+	and have a content type of text/html.  Ironically, enabling this
+	option causes Thunderbird to send the patch as a plain/text,
+	format=fixed email.  Default is `false`.
+
+imap.authMethod::
+	Specify authenticate method for authentication with IMAP server.
+	If Git was built with the NO_CURL option, or if your curl version is older
+	than 7.34.0, or if you're running git-imap-send with the `--no-curl`
+	option, the only supported method is 'CRAM-MD5'. If this is not set
+	then 'git imap-send' uses the basic IMAP plaintext LOGIN command.
diff --git a/Documentation/git-imap-send.txt b/Documentation/git-imap-send.txt
index 7b157441eb..65b53fcc47 100644
--- a/Documentation/git-imap-send.txt
+++ b/Documentation/git-imap-send.txt
@@ -57,50 +57,7 @@ to appropriate values.
 Variables
 ~~~~~~~~~
 
-imap.folder::
-	The folder to drop the mails into, which is typically the Drafts
-	folder. For example: "INBOX.Drafts", "INBOX/Drafts" or
-	"[Gmail]/Drafts". Required.
-
-imap.tunnel::
-	Command used to setup a tunnel to the IMAP server through which
-	commands will be piped instead of using a direct network connection
-	to the server. Required when imap.host is not set.
-
-imap.host::
-	A URL identifying the server. Use an `imap://` prefix for non-secure
-	connections and an `imaps://` prefix for secure connections.
-	Ignored when imap.tunnel is set, but required otherwise.
-
-imap.user::
-	The username to use when logging in to the server.
-
-imap.pass::
-	The password to use when logging in to the server.
-
-imap.port::
-	An integer port number to connect to on the server.
-	Defaults to 143 for imap:// hosts and 993 for imaps:// hosts.
-	Ignored when imap.tunnel is set.
-
-imap.sslverify::
-	A boolean to enable/disable verification of the server certificate
-	used by the SSL/TLS connection. Default is `true`. Ignored when
-	imap.tunnel is set.
-
-imap.preformattedHTML::
-	A boolean to enable/disable the use of html encoding when sending
-	a patch.  An html encoded patch will be bracketed with 
-	and have a content type of text/html.  Ironically, enabling this
-	option causes Thunderbird to send the patch as a plain/text,
-	format=fixed email.  Default is `false`.
-
-imap.authMethod::
-	Specify authenticate method for authentication with IMAP server.
-	If Git was built with the NO_CURL option, or if your curl version is older
-	than 7.34.0, or if you're running git-imap-send with the `--no-curl`
-	option, the only supported method is 'CRAM-MD5'. If this is not set
-	then 'git imap-send' uses the basic IMAP plaintext LOGIN command.
+include::config/imap.txt[]
 
 Examples
 ~~~~~~~~

From patchwork Sat Oct 27 06:23: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: 10658227
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 02ACE13A4
	for ;
 Sat, 27 Oct 2018 06:25:47 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E251F2BF74
	for ;
 Sat, 27 Oct 2018 06:25:46 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id D6B6C2BF90; Sat, 27 Oct 2018 06:25:46 +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 7B9222BF74
	for ;
 Sat, 27 Oct 2018 06:25:46 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728471AbeJ0PEi (ORCPT
        );
        Sat, 27 Oct 2018 11:04:38 -0400
Received: from mail-lf1-f68.google.com ([209.85.167.68]:43537 "EHLO
        mail-lf1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728465AbeJ0PEh (ORCPT );
        Sat, 27 Oct 2018 11:04:37 -0400
Received: by mail-lf1-f68.google.com with SMTP id u18so2473182lff.10
        for ; Fri, 26 Oct 2018 23:24: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=P62Cxnnmiuiu+Y7XPlhx3xzx/u0NNiKIerbhzajnzPU=;
        b=U0cXpZ6Z+R1EcHByK0vj03kAM4JYoYtqIootsIX7p5xctY2+EgnIH2KR/1OgAMiu56
         Wvo2A1+xObCxIL5GfPmzTPlIMWDeQWEFdpos5fs1rUv4hnQ0SCRdg+15N/nLD8yV2S5C
         waC3rt8rkdyi4OXMtjvIyga/omnKcYeDDbFZN1zzUsJe4yG099mcJBAIHFfWIu3yMRli
         oaa8q6H9Ew71ewX/44i44kP7CIg2wnguiI4hann/2fVMRmE9kcQ+UQy9xaFcuz4vV5KI
         m4sS3JEWHR5v+r+g+zDZ0o4DSr1Zp0otGrisS+79vvmSHACAVnsgiRk7jPNL6deoGRnD
         BgZA==
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=P62Cxnnmiuiu+Y7XPlhx3xzx/u0NNiKIerbhzajnzPU=;
        b=uDCcnRL9Fu+IhxQjATdRuZIcKro7lGN4le3VgoTLY2hir8vn59CaoSC7qg403jtcAW
         y2it6GMHIODMH5FifCmJAKQkC4W3dSYuut3I5BHKWeZJ7z5Na48LY6OksUeLx1JwshB9
         uj+2h+xscrO+eFS6OiJk3I4CfvPl3I2ioOaG6AxS0rr5jicszIA3cHr5lHIyKvdqYb0w
         wvBtjqOM7OiFsrNIektySolOBR1dcJ5gF4y0e9hmZ1OWfwKd5xwqFDx1T9u4dQ4NqHs4
         8wgKTkJRghZ184bVOMy6cupoWqMtfmS+snutFL09TUl7s6RJgyRZuWFS1if0chu3fX2E
         ge2g==
X-Gm-Message-State: AGRZ1gKgAaL3QRZHmDOhT/HMcCG7gd6PiXutR954zf2t+qDZkpPueSP4
        MAghczCbDPFAXNHzz29lP3/HX8xG
X-Google-Smtp-Source: 
 AJdET5fLYAmr/X1+fIPHixeNG9pRSIKjNmvSxDHiVOIczSj0eMRPwi9kQYaBp644E++XpXtHktjzYQ==
X-Received: by 2002:a19:f89:: with SMTP id 9mr3738964lfp.10.1540621481684;
        Fri, 26 Oct 2018 23:24: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
 c81-v6sm2097487lfe.79.2018.10.26.23.24.40
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:24: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 38/78] config.txt: move index.* to a separate file
Date: Sat, 27 Oct 2018 08:23:11 +0200
Message-Id: <20181027062351.30446-39-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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/config/index.txt | 10 ++++++++++
 2 files changed, 11 insertions(+), 10 deletions(-)
 create mode 100644 Documentation/config/index.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index d26656df95..03b7ac75fc 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -355,16 +355,7 @@ include::config/i18n.txt[]
 
 include::config/imap.txt[]
 
-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::config/index.txt[]
 
 init.templateDir::
 	Specify the directory from which templates will be copied.
diff --git a/Documentation/config/index.txt b/Documentation/config/index.txt
new file mode 100644
index 0000000000..4b94b6bedc
--- /dev/null
+++ b/Documentation/config/index.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 27 06:23: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: 10658151
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 19B0013A4
	for ;
 Sat, 27 Oct 2018 06:24:50 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 069192BF74
	for ;
 Sat, 27 Oct 2018 06:24:50 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id EF9512BF90; Sat, 27 Oct 2018 06:24:49 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	pdx-wl-mail.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-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 A62562BF74
	for ;
 Sat, 27 Oct 2018 06:24:49 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728473AbeJ0PEj (ORCPT
        );
        Sat, 27 Oct 2018 11:04:39 -0400
Received: from mail-lj1-f196.google.com ([209.85.208.196]:38770 "EHLO
        mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727973AbeJ0PEi (ORCPT );
        Sat, 27 Oct 2018 11:04:38 -0400
Received: by mail-lj1-f196.google.com with SMTP id k11-v6so3114057lja.5
        for ; Fri, 26 Oct 2018 23:24: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=9lmZSY4pPIgPvqsCMeyE9zdPdGZxrvR/UMk6W3APXes=;
        b=QwkPagMaCek8G7d8++udMDFM1SgJtgFwcSJXjxSKN0LU1bvtlFvZAKwiyi6A5bavV5
         VzfdVyfAh1lJ3JUnTPMBwJQNs6HK1aKXfHwqV06Q9XWFcdh2jFn0BoiylKtEcW8NqC+4
         uznkCIBsDJHOBLSQ3TipQ8GTBOgJUFsEEIgYCcIL8a46SKxkUP3hbiAdsT4lq3DeY9FO
         bN4vKpccGnQK1Ew1ycclbiLi2FNH4TrBymla1OhUzczdlzGgBObzRZiQT4EaXoJxtH2+
         flxtkme82rY8QH5o87R5dC2MAt0Z9abuUZUz6ckm4srSyhCinbgx0Oe0GIp7jTZW5Axy
         bz6w==
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=9lmZSY4pPIgPvqsCMeyE9zdPdGZxrvR/UMk6W3APXes=;
        b=OZnEOy11lCi18xR4gNON8ifxlICrjLl5FTkV1pc0UaQX6+yN1UmN1Ldoj7WDdAuz6x
         twIJEnHi16UEbsLVSQXxR/AodP/7q/8icYSY10FnE4INivBOnQ0Qi3gwbdYpLkMl9g0/
         qoJv9tNt9gtDh/x84Gg1W+fYxWD3AoQgj4RLzfOfHr1WRnjOOcik2CFnjd2X58lQm7S7
         O2+f9qHjY9OROn1ZxW2WFXt5CLpdOY0SsW+fiLsdDc1S8FElxrPSPngML1oh4yYpAspW
         y5sTCI200tOqsYtDL578i/gXaqoxRQLC8m8ZX5NRvFDtBNUnWIP/vOlLFJCN+kc0NYkV
         9JZA==
X-Gm-Message-State: AGRZ1gJZXUDLh6rYHhrNGhmWkjaJmG5OLJXBdr8DKfyweXq9+duCXKXN
        YzIm86vDXkBDzBsdfvHYKsUPX1aE
X-Google-Smtp-Source: 
 AJdET5eElXs7Wz6pBzMCtdR6bEKg2cqsTDagkukbe+hYv0/KhIGuBxLpNi4B4JykeypO8nyN47S0Iw==
X-Received: by 2002:a2e:5246:: with SMTP id
 g67-v6mr4159030ljb.73.1540621482640;
        Fri, 26 Oct 2018 23:24: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
 c81-v6sm2097487lfe.79.2018.10.26.23.24.41
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:24:42 -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/78] config.txt: move init.* to a separate file
Date: Sat, 27 Oct 2018 08:23:12 +0200
Message-Id: <20181027062351.30446-40-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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/config/init.txt | 3 +++
 2 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 Documentation/config/init.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 03b7ac75fc..94b14af9f3 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -357,9 +357,7 @@ include::config/imap.txt[]
 
 include::config/index.txt[]
 
-init.templateDir::
-	Specify the directory from which templates will be copied.
-	(See the "TEMPLATE DIRECTORY" section of linkgit:git-init[1].)
+include::config/init.txt[]
 
 instaweb.browser::
 	Specify the program that will be used to browse your working
diff --git a/Documentation/config/init.txt b/Documentation/config/init.txt
new file mode 100644
index 0000000000..46fa8c6a08
--- /dev/null
+++ b/Documentation/config/init.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 27 06:23: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: 10658161
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 7DE525A4
	for ;
 Sat, 27 Oct 2018 06:24:55 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6A3652BF74
	for ;
 Sat, 27 Oct 2018 06:24:55 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 5F0262BF90; Sat, 27 Oct 2018 06:24:55 +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 05FCF2BF74
	for ;
 Sat, 27 Oct 2018 06:24:55 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728481AbeJ0PEm (ORCPT
        );
        Sat, 27 Oct 2018 11:04:42 -0400
Received: from mail-lf1-f66.google.com ([209.85.167.66]:33049 "EHLO
        mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728312AbeJ0PEj (ORCPT );
        Sat, 27 Oct 2018 11:04:39 -0400
Received: by mail-lf1-f66.google.com with SMTP id w16-v6so2504583lfc.0
        for ; Fri, 26 Oct 2018 23:24:44 -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=5UJtoEp3AMiNglqYmMEsaS3dvKHd1Md35tvtiHlSy1Q=;
        b=GIpNhaYyGk1eMcC4bKyI5+NV2EEnUfLUm2wD2ss3GXB57dnLkJK6asnDrsHwo4rYpU
         IggbD5UnbyzGOR58MAFDWCHPKRmZi2Sv+mkhOcAwDNkoq7OM16W0TRkpi54BdjV87cdQ
         wHCY6ycBH2RkoJSy/8ig9cdZuulTLtihWBm4bjHNSu4HC+GMFIVEiIcudBJHsIjX+Rhb
         SaUeg2mUMcn0eEMOMXF6JsIbWLAk+ZVk73BcuGklw5J6NgsyBmvx7V3uG4/KP6novxXJ
         K43e7x1OTLbDOBNWqKzY15Xkd33HGrU59Z+/dTRGI1hBchPmTkXamQu60UKErH9MOl6y
         BZBw==
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=5UJtoEp3AMiNglqYmMEsaS3dvKHd1Md35tvtiHlSy1Q=;
        b=A9F1uxI4XUlYX5mk6Akdl99XOFsLolH0y2wuqk19Qi26KePOJYzz/PabXaBOWizYQU
         mKjC/bHPAYphbPpFBeD2fhnzVb/Garl/Xjltmffd5WbLQIvA/m3vpEUybNnmijIrZoN0
         0k5eCo/eL4DguRpDUpij+jKuK11MhRNHItEUZ2NOLG6YYiSHeme9+yz27VQ5G/ifXeuP
         3f22ODGxH3DdCwHac7X4aO0VMAj35CK1DgtmyjxNKxggbmEeotoYTWfEUxWiTzBTsq75
         p9tQn5tG8GCRVyGOJ0RIhfYsPA81no/3Mc1o01CRtuQ/R/sX4UU7U9Al3simmvvDpu76
         q9Kg==
X-Gm-Message-State: AGRZ1gJf3NCyAyo9az8IC9fQR9831+RdUsdWuBoNPt9i2k5TVz0l+f/x
        SOaCBPgJG7Flr2DokKJXP5DdypKJ
X-Google-Smtp-Source: 
 AJdET5dsMMshcgn5l+v5yBZf8LEAamD2myuGRGY7CWcxiulZ2BCYZNzAAil9Tl3pidn7ZNyQrzTgcw==
X-Received: by 2002:a19:e601:: with SMTP id d1mr4035555lfh.71.1540621483549;
        Fri, 26 Oct 2018 23:24:43 -0700 (PDT)
Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se.
 [80.216.12.205])
        by smtp.gmail.com with ESMTPSA id
 c81-v6sm2097487lfe.79.2018.10.26.23.24.42
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:24:42 -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/78] config.txt: move instaweb.* to a separate file
Date: Sat, 27 Oct 2018 08:23:13 +0200
Message-Id: <20181027062351.30446-41-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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/config/instaweb.txt | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 20 deletions(-)
 create mode 100644 Documentation/config/instaweb.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 94b14af9f3..5b6e2971e3 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -359,26 +359,7 @@ include::config/index.txt[]
 
 include::config/init.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::config/instaweb.txt[]
 
 interactive.singleKey::
 	In interactive commands, allow the user to provide one-letter
diff --git a/Documentation/config/instaweb.txt b/Documentation/config/instaweb.txt
new file mode 100644
index 0000000000..50cb2f7d62
--- /dev/null
+++ b/Documentation/config/instaweb.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 27 06:23: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: 10658149
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 7BCE213A4
	for ;
 Sat, 27 Oct 2018 06:24:48 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 683B12BF74
	for ;
 Sat, 27 Oct 2018 06:24:48 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 5D1C62BF90; Sat, 27 Oct 2018 06:24: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 008B82BF74
	for ;
 Sat, 27 Oct 2018 06:24:47 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728475AbeJ0PEk (ORCPT
        );
        Sat, 27 Oct 2018 11:04:40 -0400
Received: from mail-lf1-f65.google.com ([209.85.167.65]:43538 "EHLO
        mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728465AbeJ0PEj (ORCPT );
        Sat, 27 Oct 2018 11:04:39 -0400
Received: by mail-lf1-f65.google.com with SMTP id u18so2473237lff.10
        for ; Fri, 26 Oct 2018 23:24: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=tlDUc7cpyPQeKearWM7oy1maTrqLd/fwlxi30wIgiLk=;
        b=NK0ISxlaAzZrHIZupUxRD9xsYrbre3B9RO0qJ0qIfs5oLOyrucZzpASo8RmEU0rqTT
         IhRrx0BWFtXKgKh/mPqAp7kwptFnBbpgpmMaU+qUzagTxDmuX6CiHFIdv9IDuuIEswMe
         5IJzVqjlx65pNkrkUqBT/s5i5I/1lRdetagECQrt3gi98e/cemaiyu1ZECQ+c5DmMR24
         ZQLNBzwrosNDOmWX8s5lb+yeMNrIu5H01mD/RvlqoYib3zoIexHos/liGMTETfRpjMoh
         kSOorrImCQ6Zl/UvTAYvMlp7kEqnohgg1rHAsTy0nIW+bzq81GVN3pD8vCeEcygpDKVD
         cx8g==
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=tlDUc7cpyPQeKearWM7oy1maTrqLd/fwlxi30wIgiLk=;
        b=o51ELgFva6kp0WPNK2vajihMzmXgwR6RcHID6pn6SGlBuEV9F5tvclYJj9YNAgYHNM
         G9b2H4GmUAlJ36dXhP60wgjbn+1MU3ATWc79yTtpKEGrMqbo0cQB1a5SrrNE/haSRnJC
         3Fp50C7KNVwZdIA41QVHJ5+IRxtoCUiWTLVEK5HXI/JDa7BkVvzy1yrNuCwdlEYnRO0v
         ioZ/IzVeLgdwgeD+C1Dkyk0hN0aZZYL1xiC9KR+7NF8obwpjoEYOH4VF01I/D2zIHBeR
         jSz5QUzZqXWSTTFvTWs8O1IWvFjYgQClMIm2OZz1jEI1rorb130UR2639H3sxW5oyBs+
         F9eA==
X-Gm-Message-State: AGRZ1gIz49OYkSUGi+mT3uz4aLJjqZDzCxA2OPzAoGMx8ytZYQ7sMcZb
        z3PwBTk3WOlpyUBKq2ELtuGLLuAV
X-Google-Smtp-Source: 
 AJdET5eYidAFmKiDrClRj1wonFouhsEVgr94TMru+7J5ejIHzq995rRmX4iOaaDYjXHQSvUZ4l0tpw==
X-Received: by 2002:a19:db82:: with SMTP id t2mr3158576lfi.130.1540621484624;
        Fri, 26 Oct 2018 23:24: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
 c81-v6sm2097487lfe.79.2018.10.26.23.24.43
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:24:43 -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/78] config.txt: move interactive.* to a separate file
Date: Sat, 27 Oct 2018 08:23:14 +0200
Message-Id: <20181027062351.30446-42-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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/config/interactive.txt | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 16 deletions(-)
 create mode 100644 Documentation/config/interactive.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 5b6e2971e3..763bb291e5 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -361,22 +361,7 @@ include::config/init.txt[]
 
 include::config/instaweb.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::config/interactive.txt[]
 
 log.abbrevCommit::
 	If true, makes linkgit:git-log[1], linkgit:git-show[1], and
diff --git a/Documentation/config/interactive.txt b/Documentation/config/interactive.txt
new file mode 100644
index 0000000000..ad846dd7c9
--- /dev/null
+++ b/Documentation/config/interactive.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 27 06:23: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: 10658225
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 5CCE45A4
	for ;
 Sat, 27 Oct 2018 06:25:45 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4906E2BF74
	for ;
 Sat, 27 Oct 2018 06:25:45 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 3D0CC2BF90; Sat, 27 Oct 2018 06:25:45 +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 8FE222BF74
	for ;
 Sat, 27 Oct 2018 06:25:44 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728479AbeJ0PEm (ORCPT
        );
        Sat, 27 Oct 2018 11:04:42 -0400
Received: from mail-lj1-f196.google.com ([209.85.208.196]:34737 "EHLO
        mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728290AbeJ0PEl (ORCPT );
        Sat, 27 Oct 2018 11:04:41 -0400
Received: by mail-lj1-f196.google.com with SMTP id g8-v6so215371ljk.1
        for ; Fri, 26 Oct 2018 23:24:46 -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=9uMJPwbGQMEvV7/Ij4zv9PMSOu66O0uo4gl7+Wsik6E=;
        b=ZvQhKiTnhGVO/l58w1jOKbzQdm2WKrhkPnHqcy62RmVkQ+7E/34YDpojaKM1esn+vU
         gAU8q0jWU7l8yLnNZTBDR0mK9Ml9d992TyEtBbpbjW8hw8z7RrE3PreHb5EZDQdWm3T7
         h1kZFYZesWqIQ72gaUVtcgby2UiKCPfWs3Ymh4Y3LQtEsNByvw82/u/KpQu7/YjAZCJN
         Usm6oSFXYHj2EErZVrBIkD5xCLbxiMueICw/NnZQEMh4i5u656N9R0bWcGLNbJh/UD+C
         gUzSU1k1ElAJ+t/QrxC2d2+3Vs3+Fqo6KN40KL5vbf3GujdKb2O93P44MSJjFae5MF86
         nZXA==
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=9uMJPwbGQMEvV7/Ij4zv9PMSOu66O0uo4gl7+Wsik6E=;
        b=DjARjCtnim3LLf2zhB8zJebG31bN3l3/klqbFlfJRGbrC8DNjI3rWPRN/2WYSYNT6q
         +EUMpIutUMMI165+PTGMcFhz3QylGXf/yZrPCT3uqjt9fp5yoK3b3UHz8lv1c7HqxpkA
         Fb7OAwe1xlX/A15YZt541VFfTGPYvylsUo1dPcw0vBNGgXQa8+TYP/Oqc0xpvJzqEDmk
         oxyFqoWnU84lqwmgHjb4iPzxqjSfu0EtFJuuo4vO+Db0zjef2XhCKhs3cLzONpwTRDie
         3d8wTP67XkmF97m+XFr9Amkpk0mDOyhDH9wwJeo8ez6tUMcqEPduCUq5VJYVbvF3P64h
         G5AA==
X-Gm-Message-State: AGRZ1gInyMcHAA9Qc5JlDQQ87Qsj72tvY8AZkhLv730sDZlDssVBI7Ei
        lkFsYqb0NRVYcfZIHUdoguRB4MgC
X-Google-Smtp-Source: 
 AJdET5fWZLmb8GQ04YbQEikzdNjBN1A1+7PJcDbVMI9KN536xOEWQRnujO7iW/xPvY/FdsW746ItFQ==
X-Received: by 2002:a2e:7217:: with SMTP id
 n23-v6mr3624223ljc.71.1540621485624;
        Fri, 26 Oct 2018 23:24:45 -0700 (PDT)
Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se.
 [80.216.12.205])
        by smtp.gmail.com with ESMTPSA id
 c81-v6sm2097487lfe.79.2018.10.26.23.24.44
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:24: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 42/78] config.txt: move log.* to a separate file
Date: Sat, 27 Oct 2018 08:23:15 +0200
Message-Id: <20181027062351.30446-43-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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/config/log.txt | 43 +++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 43 deletions(-)
 create mode 100644 Documentation/config/log.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 763bb291e5..cce89ea50c 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -363,49 +363,7 @@ include::config/instaweb.txt[]
 
 include::config/interactive.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::config/log.txt[]
 
 mailinfo.scissors::
 	If true, makes linkgit:git-mailinfo[1] (and therefore
diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt
new file mode 100644
index 0000000000..78d9e4453a
--- /dev/null
+++ b/Documentation/config/log.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 27 06:23: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: 10658153
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 C6EA65A4
	for ;
 Sat, 27 Oct 2018 06:24:50 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B3EBF2BF74
	for ;
 Sat, 27 Oct 2018 06:24:50 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id A8CB02BF90; Sat, 27 Oct 2018 06:24:50 +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 560462BF74
	for ;
 Sat, 27 Oct 2018 06:24:50 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728483AbeJ0PEm (ORCPT
        );
        Sat, 27 Oct 2018 11:04:42 -0400
Received: from mail-lf1-f68.google.com ([209.85.167.68]:41509 "EHLO
        mail-lf1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728465AbeJ0PEm (ORCPT );
        Sat, 27 Oct 2018 11:04:42 -0400
Received: by mail-lf1-f68.google.com with SMTP id c16so2480777lfj.8
        for ; Fri, 26 Oct 2018 23:24:47 -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=LCdXSgucuI2ZkXckOne9PQSndCQmWXh2F+9CZtoPx4w=;
        b=C5PWuRPM2m8sPipMCXeEv0ZcjNKNEeFaNBFyZxK2qi80qis1p8zzJslhtoZt6Nc54j
         xyL2IRpHs95o1xclfnFolBUQFasxnmQoYtXbokn8UEWvcGFdsLvnUhHT0lz0BVLDVq2T
         C3U6YxaBC/vZpSDGweO3qbzwdKPN/rhYVVh7fwlafmj/2v0BTkJAKnh/FH6HsRXFYd0e
         91sUSDx2BXBSXSPrmYNYnHfTzBKm8TbdgGWuFAddHL4Vyqgh0yBLTtiTvgx031avY9uo
         LB6T+3xukEpQHGVKubW5QglKrCzoQkNB9EMNjPuNO6hTO+QCwgrG9+5pplLKOjGAhlND
         k6hw==
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=LCdXSgucuI2ZkXckOne9PQSndCQmWXh2F+9CZtoPx4w=;
        b=LFB45ZYeVWjbgqyokVY6u31k3UAeldaieQj3fqkF5kYNr7RRMxivVz31XcSAqxKvvM
         8XRwSt2VLKkNysNMn/XPCuHXAIpfNYh4Mdhq9fmS2bBtQNgelDnxt27pRYAbS5HSq9xv
         AB0/VP8061C/m3ofxvDDJ5B6ekqoFOEs3x7NY0ZyVt6VpdUEyScEIDBNRr0hYrVDaxeZ
         fwvqDYg1kSkFkL8qL/xoYicQrslbczwi/ZaUWMrm7Y99/oDp9tg2FM48JML2e+L4uaZI
         mUfOqGM0PfRn0sspX+u0OXc01bI48Zoa+qUpqGXq/9CGTyRyw1pyqAL8xRYw3xnYA3IL
         OM+A==
X-Gm-Message-State: AGRZ1gJXuckrrwVf6CpNzeC1LrbhKvlKQdDyFdSc3d09elYOpJNaLDSy
        s7XVgfvtGOWdSvE0xleYW9tkHAHD
X-Google-Smtp-Source: 
 AJdET5cJoMeyCjqJkaH7yco4G5zjV7NI3w3q0hMMBRDMXknAfAGD8xENznTIDPkh+Vb6JSjKV3NYaw==
X-Received: by 2002:a19:3809:: with SMTP id f9mr3659758lfa.148.1540621486520;
        Fri, 26 Oct 2018 23:24:46 -0700 (PDT)
Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se.
 [80.216.12.205])
        by smtp.gmail.com with ESMTPSA id
 c81-v6sm2097487lfe.79.2018.10.26.23.24.45
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:24:45 -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/78] config.txt: move mailinfo.* to a separate file
Date: Sat, 27 Oct 2018 08:23:16 +0200
Message-Id: <20181027062351.30446-44-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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/config/mailinfo.txt | 6 ++++++
 2 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 Documentation/config/mailinfo.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index cce89ea50c..585d55d03d 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -365,12 +365,7 @@ include::config/interactive.txt[]
 
 include::config/log.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::config/mailinfo.txt[]
 
 mailmap.file::
 	The location of an augmenting mailmap file. The default
diff --git a/Documentation/config/mailinfo.txt b/Documentation/config/mailinfo.txt
new file mode 100644
index 0000000000..3854d4ae37
--- /dev/null
+++ b/Documentation/config/mailinfo.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 27 06:23: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: 10658155
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 EF17C5A4
	for ;
 Sat, 27 Oct 2018 06:24:51 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DABF62BF74
	for ;
 Sat, 27 Oct 2018 06:24:51 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id CDA9E2BF90; Sat, 27 Oct 2018 06:24: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 7092A2BF74
	for ;
 Sat, 27 Oct 2018 06:24:51 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728484AbeJ0PEo (ORCPT
        );
        Sat, 27 Oct 2018 11:04:44 -0400
Received: from mail-lf1-f67.google.com ([209.85.167.67]:39706 "EHLO
        mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728477AbeJ0PEn (ORCPT );
        Sat, 27 Oct 2018 11:04:43 -0400
Received: by mail-lf1-f67.google.com with SMTP id p11-v6so2488490lfc.6
        for ; Fri, 26 Oct 2018 23:24: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=tTjwiCHQrqZYhlV2p3e3hALyq/MQMB0jvHHS3f5l5ko=;
        b=mlLS5OSBKLUnIUr6gptBgTbazD9oIHKf95uzpof4T0cBQRF+yAeDCihuLIZF++1hT7
         kXBseoxlYqkrVVO9SVhAfHkAuxhKXlPVWZlrZZzmIK2VS+saTAwAsjZffldkL6QIq69R
         S/WgVpoNJwS7v4qEzuZ8shbMM26EPFGj2/A9afcWr345rEOcw5VbltCd8GPVyfjP7ITe
         lhSGQMO++7QkMSDDNj9/epxg4p0C6SK2sd0EUhTxv3rMZ+i3trOIFeoYV0PAqr7ATdfu
         SMJzCMS/VInHAcap2i3cNlJJdIYUtobGgkvIytfea7lvPN+/zaubNiC9/1buDd5Q4NZB
         4fYA==
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=tTjwiCHQrqZYhlV2p3e3hALyq/MQMB0jvHHS3f5l5ko=;
        b=H/kn1oMeAPJ72I5pMgOPfwan702aeZcDz4gJTRL85LNSNRRymyRBS6lAl+nvGVxmky
         406F2dT5KGhLMY4MLzrN0ceSnrn2kMHxvs53BXMk5elVvTMRqXAowfWQNc2QjG0GOePN
         Cayqf84+tjx2fNvtHI7FVZarA/Zqd0O62rAmj9vwk/RJ8KAZUN9ibHB/oIH82yDlaz1+
         ybJsEn4NRI+fmRtk1H0Vi7YhC4Nt67u4Qd2I5zuNqHckZkkiuBSmyfoqwDp/goqIh+gj
         Ayz2zQZM8bCUlNRelBXzCOi8SZo7BcIYZ0se+B4Lu3NFiheRmURTP52lV3h4rNzuph+1
         032A==
X-Gm-Message-State: AGRZ1gKwYHCTQpp8KFY6xScnSLChRzvbs4vjSQXuYCYHlRmQKEo8K3h4
        AJUi6OJENIXzhnoQrsisCI53Jta0
X-Google-Smtp-Source: 
 AJdET5eaGNhz+Ujh3XhyeZDMNNj6UiBg4eu3xw6xOZhRdcKgvvpY0FPm9knPTvNebPc9bC5oHqtBsw==
X-Received: by 2002:a19:cb94:: with SMTP id
 b142mr3978238lfg.117.1540621487633;
        Fri, 26 Oct 2018 23:24: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
 c81-v6sm2097487lfe.79.2018.10.26.23.24.46
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:24: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 44/78] config.txt: move mailmap.* to a separate file
Date: Sat, 27 Oct 2018 08:23:17 +0200
Message-Id: <20181027062351.30446-45-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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/config/mailmap.txt | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 15 deletions(-)
 create mode 100644 Documentation/config/mailmap.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 585d55d03d..ff9c8797a6 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -367,21 +367,7 @@ include::config/log.txt[]
 
 include::config/mailinfo.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::config/mailmap.txt[]
 
 man.viewer::
 	Specify the programs that may be used to display help in the
diff --git a/Documentation/config/mailmap.txt b/Documentation/config/mailmap.txt
new file mode 100644
index 0000000000..48cbc30722
--- /dev/null
+++ b/Documentation/config/mailmap.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 27 06:23: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: 10658157
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 60D1A13A4
	for ;
 Sat, 27 Oct 2018 06:24:53 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4DDE32BF74
	for ;
 Sat, 27 Oct 2018 06:24:53 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 41BEC2BF90; Sat, 27 Oct 2018 06:24: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 E3AA72BF74
	for ;
 Sat, 27 Oct 2018 06:24:52 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728486AbeJ0PEp (ORCPT
        );
        Sat, 27 Oct 2018 11:04:45 -0400
Received: from mail-lj1-f195.google.com ([209.85.208.195]:42947 "EHLO
        mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728465AbeJ0PEo (ORCPT );
        Sat, 27 Oct 2018 11:04:44 -0400
Received: by mail-lj1-f195.google.com with SMTP id f3-v6so3106475ljk.9
        for ; Fri, 26 Oct 2018 23:24: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=FnutxFTPztpuDxLWY4Pw6IBjznFL6q3e38gmIB5TEno=;
        b=mojxbsaJ7sR6friWBvDdjZ5fQaoVHHGtHRueOc2CiuT0/JtA2GFc8wc0knjVE53lBI
         NvyC/IXcBbo6L/ZZVCM6TLRWswV3ZZuQ/RCpfI2HNDsMIFLEifwTWm4iRo0adWEkZN2W
         gHGSdXE6A5Ilz5wlUToOTCn2eljOInQAxczI2l5XFssf/rLXRAWdx3ixKYGQlpGaIgVg
         DFvo9S6ellhJ5Q5EdR2YPxgP90Rn+958NoCtnsu4qt33e4QAX6DKfRFRJdmmR7MBz90q
         O5Xgk7pDdo3g1D1xr5ZbtjUVxtptq6D6EsHDKF8k0LQTRQZt2h+uwpq09tDOVVzh5eTZ
         JH/A==
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=FnutxFTPztpuDxLWY4Pw6IBjznFL6q3e38gmIB5TEno=;
        b=koSOvvy3ZkPCxH5iZzZmMtlXawah0p8DTCrfQSr30KMTwIVyCtlwb+CHrXbg37uaAP
         CV8G3zHzQauo2StEoapdjA6gjk3NjG14Yr86RkSpOg2MbPJQCyBmg4iP3WR8Yu7siSNz
         /EgzccVvn69tMXUSMhQfWzAwvBgZ815KDHRSCSYETymjKvPUCy76dzdL95DHbVnfQu/e
         7tct7LLw8wsPK/aL1LfVin+/c+yuM8kVT/lyFQqPKDRKazbjSeDN/5KDGthMid/4fzRL
         72/JvuZiTQ8IllmGbk+5bpoN7gEXrd4dAoGLeXTHDonUNIFy/8JhndImYKTDdrfaTg3n
         7DSQ==
X-Gm-Message-State: AGRZ1gLFEtTR6DcUGeUyfOECQoRIr6yfSnKW1aIEpgb5BK2AWTHiQxfl
        VBgjlCtJfBsNKf1mwtLykF1axITc
X-Google-Smtp-Source: 
 AJdET5d7KpKd/+iFzmYGQ8CGwZ088AwsyavytbyeYRjc8yCoF4KFT1gbHNCCZYoqVnB/MSOhadU7Hw==
X-Received: by 2002:a2e:197:: with SMTP id
 f23-v6mr4177557lji.144.1540621488746;
        Fri, 26 Oct 2018 23:24: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
 c81-v6sm2097487lfe.79.2018.10.26.23.24.47
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:24:47 -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/78] config.txt: move man.* to a separate file
Date: Sat, 27 Oct 2018 08:23:18 +0200
Message-Id: <20181027062351.30446-46-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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/config/man.txt | 12 ++++++++++++
 2 files changed, 13 insertions(+), 12 deletions(-)
 create mode 100644 Documentation/config/man.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index ff9c8797a6..c3c92bc269 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -369,18 +369,7 @@ include::config/mailinfo.txt[]
 
 include::config/mailmap.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::config/man.txt[]
 
 include::merge-config.txt[]
 
diff --git a/Documentation/config/man.txt b/Documentation/config/man.txt
new file mode 100644
index 0000000000..a727d987a8
--- /dev/null
+++ b/Documentation/config/man.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 27 06:23: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: 10658159
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 BB63313A4
	for ;
 Sat, 27 Oct 2018 06:24:54 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A7F252BF74
	for ;
 Sat, 27 Oct 2018 06:24:54 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 9C8EA2BF90; Sat, 27 Oct 2018 06:24: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 888412BF74
	for ;
 Sat, 27 Oct 2018 06:24:53 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728490AbeJ0PEq (ORCPT
        );
        Sat, 27 Oct 2018 11:04:46 -0400
Received: from mail-lf1-f66.google.com ([209.85.167.66]:45241 "EHLO
        mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728309AbeJ0PEp (ORCPT );
        Sat, 27 Oct 2018 11:04:45 -0400
Received: by mail-lf1-f66.google.com with SMTP id c24-v6so2470140lfi.12
        for ; Fri, 26 Oct 2018 23:24: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=AvaIxiBWAf0pqdeCL7VbisBKHOTqr0sIV52W+JIJd8U=;
        b=uiOnZs/cZmh0ppio6dJuM2qa3yuHTzJBOt5LLR6w+Lw+Z3fIFqFsOlQVNMQuhRWKZj
         t2DwqbgUk+Ss3pLh4ieNM/L6YkV8IWhTf089Cc2k+P4KQMZEr6CfKCe13/VvLf8tdk9n
         GicF4dngEpLgGZR9PtnLkWrCqsaxbKnA+x2QTaSODp7x84YAs3ZL8R6DjZfntGLmmZJl
         KzkxHk1vDHvhmBIpxD7R7TKbMCVEIOLXkd7a+7OJj4sUdT/SVB0Ev6w6COYUa+ZE36Z0
         4EWychETgpsAvJLij2CIasO1zWUBiyEp5B4VbUA6SSvCPSFHKR2DLgYsDzZ6L+fkSJJF
         PU7A==
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=AvaIxiBWAf0pqdeCL7VbisBKHOTqr0sIV52W+JIJd8U=;
        b=j0Y7BvKNglNmbvvEXho/Hm/HQY14eiXYAQbY0tFi3EZl7Omf37ah92geL0fYLewpEX
         GwdvtmyQJWPKD4tpAS3RNjh2QAihzGEYC9GoaHDXojrcNnI1MMe9wilhyxQrL/XBmDwR
         GvOn0/VxL7v3/3kBZz5RJzEshS2IYutsVfWkPdGhxCJcPUUAOqF0TjFnfpE+lG5Xe01J
         YlFhpEXjm5xoLEDf6346ApJSWqPdVZsbJ3Ni3esxUR1fN5ztqN1LXDPyEAtM8e4nQ6Lr
         JcVCOsHirXWp+7xdzb6RIOFFXeHZZLr4wWLqJbKRbYnLZvaSC/joVAiKEGqFV6u9Cm56
         LwIQ==
X-Gm-Message-State: AGRZ1gKpr7a82z9ltkGqyAyhfMpFSsU4wjl3iGr0GIyVWiP2DnD7w7Tb
        eQoZKmY+7yiqBQwZTbFEKa9znMah
X-Google-Smtp-Source: 
 AJdET5eb4kXM58G3u1rcCKFY2WaB0AJ0sRXgX+HwX/IczfiG5ZXZ9M56polv41O9My3r4YQ0CZ/0cw==
X-Received: by 2002:a19:5a84:: with SMTP id y4mr4019447lfk.156.1540621489729;
        Fri, 26 Oct 2018 23:24: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
 c81-v6sm2097487lfe.79.2018.10.26.23.24.48
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:24: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 46/78] config.txt: move merge-config.txt to config/
Date: Sat, 27 Oct 2018 08:23:19 +0200
Message-Id: <20181027062351.30446-47-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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                             | 2 +-
 Documentation/{merge-config.txt => config/merge.txt} | 4 ++--
 Documentation/git-merge.txt                          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename Documentation/{merge-config.txt => config/merge.txt} (98%)

diff --git a/Documentation/config.txt b/Documentation/config.txt
index c3c92bc269..441787e815 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -371,7 +371,7 @@ include::config/mailmap.txt[]
 
 include::config/man.txt[]
 
-include::merge-config.txt[]
+include::config/merge.txt[]
 
 mergetool..path::
 	Override the path for the given tool.  This is useful in case
diff --git a/Documentation/merge-config.txt b/Documentation/config/merge.txt
similarity index 98%
rename from Documentation/merge-config.txt
rename to Documentation/config/merge.txt
index 0bb703fbac..321d1c8ba9 100644
--- a/Documentation/merge-config.txt
+++ b/Documentation/config/merge.txt
@@ -30,7 +30,7 @@ merge.verifySignatures::
 	If true, this is equivalent to the --verify-signatures command
 	line option. See linkgit:git-merge[1] for details.
 
-include::config/fmt-merge-msg.txt[]
+include::fmt-merge-msg.txt[]
 
 merge.renameLimit::
 	The number of files to consider when performing rename detection
@@ -63,7 +63,7 @@ merge.tool::
 	Any other value is treated as a custom merge tool and requires
 	that a corresponding mergetool..cmd variable is defined.
 
-include::mergetools-merge.txt[]
+include::../mergetools-merge.txt[]
 
 merge.verbosity::
 	Controls the amount of output shown by the recursive merge
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index eb36837f86..4cc86469f3 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -342,7 +342,7 @@ include::merge-strategies.txt[]
 
 CONFIGURATION
 -------------
-include::merge-config.txt[]
+include::config/merge.txt[]
 
 branch..mergeOptions::
 	Sets default options for merging into branch . The syntax and

From patchwork Sat Oct 27 06:23: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: 10658163
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 66D0C13A4
	for ;
 Sat, 27 Oct 2018 06:24:56 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 537FD2BF74
	for ;
 Sat, 27 Oct 2018 06:24:56 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 481222BF90; Sat, 27 Oct 2018 06:24: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 A92552BF74
	for ;
 Sat, 27 Oct 2018 06:24:55 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728491AbeJ0PEr (ORCPT
        );
        Sat, 27 Oct 2018 11:04:47 -0400
Received: from mail-lj1-f195.google.com ([209.85.208.195]:43720 "EHLO
        mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728465AbeJ0PEr (ORCPT );
        Sat, 27 Oct 2018 11:04:47 -0400
Received: by mail-lj1-f195.google.com with SMTP id g26-v6so1844419lja.10
        for ; Fri, 26 Oct 2018 23:24:51 -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=k/Im3mJ33mbbS7npXAvUaG1c6jlFf6OXyOQJBNvPaIE=;
        b=nGRH6zNQtVX5ANhstsMKXlZqu/EVwOBkxm5jRcZDJYmbjGEqtGdMYitJkgvKXwFfVc
         fVFWopf6AVPY4jdJ/I2IqXjBumTQx+e1ofb3eheMLIPNylwk7+8a4s+forni1CG/nDa9
         WU+uI938KjFH9jm3zAUzEKOfdzHGXhkwUTnHxMo1kqJfq6c1Bhzu9JGcNjYC44Z/1ZLO
         bFV4wzZVEwNudE/P/d9zPkWvaGgPe/WTQiMxo9x6BNzMSAAq2zwXSxvCS3Yh2xhS/4Mp
         Jg+7VVaql0jVUuq6tPccoktZZBwDV88ylgCT9sYP+rI4BcRC80fKD4P8wbIsuBsiPcvL
         vYBw==
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=k/Im3mJ33mbbS7npXAvUaG1c6jlFf6OXyOQJBNvPaIE=;
        b=jqUe9XTUZGbHIazR5IT9x7LzMdoq4534Uv3h0rQu1fkEAQRKywt+lYwH39ivQvkA2p
         /K3KO8JoSKMzrYiIIYLnp183lJhWT9xm/SFrKsezA4NCoEg9KP4wAMdI2nUIIsLH8dWD
         1M/hALXKur1COchhp46HCE2/hGeavo5ETR6I7AT8doc1MSO8EzUl9XomlT3PYfxYBBNO
         3Ntjlx91n0zdcG9gU5ff6jJOQ7yeFeu2VLe0QECASl0w1RGeKzBVNS+zOEHT8AorFzcM
         TIy8A6HJ2o28tdSUAmt+YArQg+aoLJ2NyYcpzBOxrsE3gsO6NZf0iF8lGm8Qh4I+292C
         7r6A==
X-Gm-Message-State: AGRZ1gLN+WjPtgDCzO0nVq355Plft4JnLv/49IvZb3epPrzbvBS7rpt2
        byy8IE1tPz2QPIKPTFh7CR+BSIVE
X-Google-Smtp-Source: 
 AJdET5dSl5tuZXe0WcffDEoggniFv0fjyT9FjTE3nckCp256G2CzUYvdnbd/8npjj50de0002XdCVA==
X-Received: by 2002:a2e:9615:: with SMTP id
 v21-v6mr4144077ljh.150.1540621490920;
        Fri, 26 Oct 2018 23:24:50 -0700 (PDT)
Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se.
 [80.216.12.205])
        by smtp.gmail.com with ESMTPSA id
 c81-v6sm2097487lfe.79.2018.10.26.23.24.49
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:24: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 47/78] config.txt: move mergetool.* to a separate file
Date: Sat, 27 Oct 2018 08:23:20 +0200
Message-Id: <20181027062351.30446-48-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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/config/mergetool.txt | 53 +++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 53 deletions(-)
 create mode 100644 Documentation/config/mergetool.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 441787e815..35a6b4e0e0 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -373,59 +373,7 @@ include::config/man.txt[]
 
 include::config/merge.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::config/mergetool.txt[]
 
 notes.mergeStrategy::
 	Which merge strategy to choose by default when resolving notes
diff --git a/Documentation/config/mergetool.txt b/Documentation/config/mergetool.txt
new file mode 100644
index 0000000000..09ed31dbfa
--- /dev/null
+++ b/Documentation/config/mergetool.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 27 06:23: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: 10658165
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 ACFF513A4
	for ;
 Sat, 27 Oct 2018 06:24:57 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 98FEE2BF74
	for ;
 Sat, 27 Oct 2018 06:24:57 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 8D6E42BF90; Sat, 27 Oct 2018 06:24: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 E97CD2BF74
	for ;
 Sat, 27 Oct 2018 06:24:56 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728496AbeJ0PEt (ORCPT
        );
        Sat, 27 Oct 2018 11:04:49 -0400
Received: from mail-lj1-f193.google.com ([209.85.208.193]:43719 "EHLO
        mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728278AbeJ0PEs (ORCPT );
        Sat, 27 Oct 2018 11:04:48 -0400
Received: by mail-lj1-f193.google.com with SMTP id g26-v6so1844433lja.10
        for ; Fri, 26 Oct 2018 23:24: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=/TrES8Ilm1hQEnz+QmAgztK6hW2lE0IPFVSqQHOgnd4=;
        b=FskiPs+c1kXtH0ncZsWFc6xu0oYLzTip+K5f/2BTEx8n6JyyYYhTPKOFT1xJt2hIP0
         rLUffHZ0KuP+DcO4RgJhJ//YzSxLEHYuar2o3QYVLfA8SqiWHmKJHpl6RuEXhaYJsyTh
         Ze/IIMfRAzBqP3NmK2prgMVBNMFL2bM/myqNZeyhPstllnvM8ED29Xs3FjbzHx9ihQvW
         m7dBr+p4fqBnnA+TNWDebOC0IT3aP3q6s8OJrsQv0JyyfvYKzpcufgka4V+1pIMvE0mU
         77jMdpvHD2i/ZrMH5pzMMCJHw4X4UYZPuX0geRnaEUJW76Tc7A3OeP2NdQJzOcSl3ANL
         P8KQ==
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=/TrES8Ilm1hQEnz+QmAgztK6hW2lE0IPFVSqQHOgnd4=;
        b=dmM/aB3vcVDfierGN3WKaeKCoxRdYOKNWksOfWDBm9E9sci2irE6ZaXB8O/ms3Ad3a
         xI116LM5bNlwwfq2LDOngZrXK8OoUiVPvnauNZqTXcGMe6ffhHXU7RylTYNsjSOpRoNL
         CSkaJuSQNlpdFPrJZnMq+erJkk2b8xVOXcsplKbn2ofG6+gFTMchfQgDaESOTB7xVwuG
         sh6qiXqeD/bSjvJ71RXsJGf/ZQ7yhV11fXT0+whvqmODerwNg4E6uP5ynB4qBBcWojPO
         13BZL/RBOf7sn2NUrSYWnzhLbe7+RPMbpxXeOBMt0FkzFsHhNlxKlGYclC2VB/HaqM5U
         AZTw==
X-Gm-Message-State: AGRZ1gLRJy10xyJL8sK4LPm33NeUCzGLMVIGEwACu6Gw1oGX873YZe6D
        LQLRTtBc8pRdzhCK2Kh4Fcb2xm9W
X-Google-Smtp-Source: 
 AJdET5dEP1GFdmrDPkri7WvD+kmIpB8jUL2ILGcmtE96jaI4nrzAAfrYMBpWHUtvGyvrJuu/LidDWw==
X-Received: by 2002:a2e:a202:: with SMTP id
 h2-v6mr3633402ljm.143.1540621491975;
        Fri, 26 Oct 2018 23:24: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
 c81-v6sm2097487lfe.79.2018.10.26.23.24.50
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:24: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 48/78] config.txt: move notes.* to a separate file
Date: Sat, 27 Oct 2018 08:23:21 +0200
Message-Id: <20181027062351.30446-49-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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/config/notes.txt | 59 +++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 59 deletions(-)
 create mode 100644 Documentation/config/notes.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 35a6b4e0e0..babe2e5682 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -375,65 +375,7 @@ include::config/merge.txt[]
 
 include::config/mergetool.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::config/notes.txt[]
 
 pack.window::
 	The size of the window used by linkgit:git-pack-objects[1] when no
diff --git a/Documentation/config/notes.txt b/Documentation/config/notes.txt
new file mode 100644
index 0000000000..aeef56d49a
--- /dev/null
+++ b/Documentation/config/notes.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 27 06:23: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: 10658169
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 393FE13A4
	for ;
 Sat, 27 Oct 2018 06:25:00 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 255E32BF74
	for ;
 Sat, 27 Oct 2018 06:25:00 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 17B532BF90; Sat, 27 Oct 2018 06:25:00 +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 298582BF74
	for ;
 Sat, 27 Oct 2018 06:24:59 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728498AbeJ0PEv (ORCPT
        );
        Sat, 27 Oct 2018 11:04:51 -0400
Received: from mail-lf1-f66.google.com ([209.85.167.66]:44144 "EHLO
        mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728465AbeJ0PEu (ORCPT );
        Sat, 27 Oct 2018 11:04:50 -0400
Received: by mail-lf1-f66.google.com with SMTP id m18-v6so2472055lfl.11
        for ; Fri, 26 Oct 2018 23:24:54 -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=wmEsge3nnQNOu47iJBdhdgitt4glpOjnipiQiWqkT0U=;
        b=P5I1QMQWuliR/0mbjzE5XBlYYOrTqErKVqZzxF02PDEdCrhUQ3HD5dVQskJhyg6gTR
         WCPBcjsrBzA5bunx3tt5p2E4EOkPwgZC0i9SZp+3Wcdbw7YRHMH14H5tQYZ0xiT/uzQG
         22rp3FcDtFQhEUabATmiACayD2GLHSPVgo7LDv0zLphhKj0Dy0vPjcRmXrJXxOfhicsX
         uTIkP1U8fOkhids0lwO2erWls700b34vDylhJIkrPPzy09mpeCvQKnxw0glndmv6l4ZD
         PrnYPccymTo+0HG5LIrqa6hCQ0eC0NtXLPOTM1c5rUdbZDiLvtkviNBQJIgCIxLZZJgC
         E37w==
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=wmEsge3nnQNOu47iJBdhdgitt4glpOjnipiQiWqkT0U=;
        b=mJjGXCHLi3yK0qxstOO4a+RoHJN2YTRf/SiR4QEjsyeIOTvb3+E6pdYU/WOr2Z5GZ2
         c7UB3uIeN9nIPy86/6xBBREZDBYLhyCVcTuCoUYNyfD+rXDfbRSI3fSVyS/jSPxq/tPr
         YXxfzkCPabNkiSOQ6gR75iyhGX79k+CUmcx0s8g4T/JFar8LgVc5oYpPLqvRCUvcCck2
         qiO+D8G0RGA6p6b+VootRDkul6LbYzfbQnRvvGeVzMa+7AbRuibVRcrc0ZRcMUo0XyHt
         hUmh1qNfRM++WplV8p6ygZVOy31mDkvsT9iHA2nXRN4yG4daEMAQAp3oLozRQAtHbJQB
         LJ8A==
X-Gm-Message-State: AGRZ1gIvt2K6KEnl/FCIZAPsyoCDPVdvex2JjGd8JllSNq4Ya4kJCc+T
        Q/FdYsPH/kZk68GG90c+KVd45KTh
X-Google-Smtp-Source: 
 AJdET5euRf8MUrujTEF42O74QXiGgDuqTI5L+t1iuZjV54G2ePTfHkKO3U9CDobCVNSjemBYTFOmJg==
X-Received: by 2002:a19:945b:: with SMTP id w88mr3714690lfd.15.1540621493093;
        Fri, 26 Oct 2018 23:24:53 -0700 (PDT)
Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se.
 [80.216.12.205])
        by smtp.gmail.com with ESMTPSA id
 c81-v6sm2097487lfe.79.2018.10.26.23.24.52
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:24:52 -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/78] config.txt: move pack.* to a separate file
Date: Sat, 27 Oct 2018 08:23:22 +0200
Message-Id: <20181027062351.30446-50-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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/config/pack.txt | 120 +++++++++++++++++++++++++++++++++
 2 files changed, 121 insertions(+), 120 deletions(-)
 create mode 100644 Documentation/config/pack.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index babe2e5682..4e839db64c 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -377,126 +377,7 @@ include::config/mergetool.txt[]
 
 include::config/notes.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::config/pack.txt[]
 
 pager.::
 	If the value is boolean, turns on or off pagination of the
diff --git a/Documentation/config/pack.txt b/Documentation/config/pack.txt
new file mode 100644
index 0000000000..edac75c83f
--- /dev/null
+++ b/Documentation/config/pack.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 27 06:23: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: 10658167
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 1C0E75A4
	for ;
 Sat, 27 Oct 2018 06:24:58 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 090982BF74
	for ;
 Sat, 27 Oct 2018 06:24:58 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id F187B2BF7B; Sat, 27 Oct 2018 06:24: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 9F45D2BF91
	for ;
 Sat, 27 Oct 2018 06:24:57 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728278AbeJ0PEu (ORCPT
        );
        Sat, 27 Oct 2018 11:04:50 -0400
Received: from mail-lf1-f67.google.com ([209.85.167.67]:45246 "EHLO
        mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728492AbeJ0PEt (ORCPT );
        Sat, 27 Oct 2018 11:04:49 -0400
Received: by mail-lf1-f67.google.com with SMTP id c24-v6so2470203lfi.12
        for ; Fri, 26 Oct 2018 23:24:55 -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=aMMEfMFkmh9japNZDtK8C9giNrRCN6wf/R30hRYr1tc=;
        b=sT2WmwsT2om4lxZyA06P/PIiUURJUfPnfyOylzmB0IKKSyK3NmfGLR+DBrtGLIMcos
         UBpkVZ9vErImcNRanFyiQm0pYjUsuRW0s3Dz1gI3QcBVUsTPs2yercMv5OvKH0/f5JAV
         Du/zDEW/ICVR52kHzdI6M2AZDMhhiDw8HV3QJRfjqEDCj4YTxAvD6LHq+t5s29o9lNwv
         jUneYwrlNlq5hJX50JF43ywAOROCu7inRxrT68bfK8UnnGRS49qUzwItSpi4x0gKmT/u
         bYH1d92VuqtaObTvEvftoBORcJPD36XL6LP86ZYqHuhTv0GWhC5NPkLVFC9Pv908/3fg
         Me4A==
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=aMMEfMFkmh9japNZDtK8C9giNrRCN6wf/R30hRYr1tc=;
        b=rg6w5q66pZr9Ax7U2Li4Iv+JWdj5zIIEkVXYxHh1SzQEOQcSFdBn0hdapdxvV3Z81P
         9R7+e8NtvFYqjz4ny4SdDPBF+W4B1kIUIpWnxirvWa75uoDxMmgitBHzVFzIT9yTVhbj
         IBt+LuMM1711GVT9yeJzfNmWJ20Ebo3/sxzMN5hp2czBS/bQ6jwvZeXs0x+lpRCSKS53
         7dudLbEDLR1hNLHYgnTE1vEFol4x5eo7QvV00OrZHd8naBFKK6c0EljGUlbzI8ttg9+J
         twBL2Xk2NnmBeBcIaOVGJX6ZbogwRcWI0j6dsUSoiDd8A2yQFH+hJhjFMH+xxd81sXsS
         o/2A==
X-Gm-Message-State: AGRZ1gJXY6DVO9QSvCQvdnJPLKmr4tbRmBD5+Dwtlgw5X/dQ31bSX6Un
        8QHVF3cTr4+GD2M3LVT6MZCZfviq
X-Google-Smtp-Source: 
 AJdET5dsLS9szvU5LOLYPNoH6kNtGalUfj3VisEIlNeWH/EGYwjVxLMXSLTE1Y/BpJ6u/MOOMJMcxg==
X-Received: by 2002:a19:a28e:: with SMTP id l136mr4062697lfe.87.1540621494016;
        Fri, 26 Oct 2018 23:24:54 -0700 (PDT)
Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se.
 [80.216.12.205])
        by smtp.gmail.com with ESMTPSA id
 c81-v6sm2097487lfe.79.2018.10.26.23.24.53
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:24:53 -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/78] config.txt: move pager.* to a separate file
Date: Sat, 27 Oct 2018 08:23:23 +0200
Message-Id: <20181027062351.30446-51-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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/config/pager.txt | 8 ++++++++
 2 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 Documentation/config/pager.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 4e839db64c..a7b72d2722 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -379,14 +379,7 @@ include::config/notes.txt[]
 
 include::config/pack.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::config/pager.txt[]
 
 pretty.::
 	Alias for a --pretty= format string, as specified in
diff --git a/Documentation/config/pager.txt b/Documentation/config/pager.txt
new file mode 100644
index 0000000000..d3731cf66c
--- /dev/null
+++ b/Documentation/config/pager.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 27 06:23: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: 10658183
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 9BCA013A4
	for ;
 Sat, 27 Oct 2018 06:25:08 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 89F582BF74
	for ;
 Sat, 27 Oct 2018 06:25:08 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 7E9342BF91; Sat, 27 Oct 2018 06:25:08 +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 27ADA2BF74
	for ;
 Sat, 27 Oct 2018 06:25:08 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728492AbeJ0PEv (ORCPT
        );
        Sat, 27 Oct 2018 11:04:51 -0400
Received: from mail-lf1-f65.google.com ([209.85.167.65]:46317 "EHLO
        mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728494AbeJ0PEu (ORCPT );
        Sat, 27 Oct 2018 11:04:50 -0400
Received: by mail-lf1-f65.google.com with SMTP id o2-v6so2462012lfl.13
        for ; Fri, 26 Oct 2018 23:24:56 -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=QplCtkaDuUtMuyf2Roe21ES+wFnR0RypRvuejeV7x5U=;
        b=QfqEKNaU5nHkowskVTFIhVFNqh9JXCpFSg3/0I6DxxhgK18bx4sKj/h4c0jJF4hZ+c
         BCYRExWKLNsPbJhFQuvMs3MYqGak4UqdBT5YnWc1qBFMyJV35EgI0eP+SsLZbVlSdUsH
         2Q8BKqbm02+9f/HaAAPQW6GzS4hCHFJvD+km4+GREkdPjw8pBpqe2rfkrrPJ1SnDLcOP
         OTKTwq77gnBxkPnlcU+XwImVI+p01M8OvFS34d+Zkpfskj0K7hk5lQy4H5M8iLB/PXjL
         fMMxV8mPsFYSDeaUTMuETge1a4sfAHPvZqWTg9iygzAqzlQGsol4rIAygjWmjhVReiOU
         LOcQ==
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=QplCtkaDuUtMuyf2Roe21ES+wFnR0RypRvuejeV7x5U=;
        b=q9dEdkE6HFwwnj8r5QCpuGIi0uuGcZMADG0+BARmExGnYSZYU87jsqDmqO5/AYPYmi
         dviOsgToF69lXbynUZ/sP0rUM33wRWOaGxKmkcdGcKfGERqFMwRVV41OG7TzU5pVfeka
         187TNFuvYDHKpTaaYIYQi8tF3WDRw3WhElMNT/iQEdDbl2NwY6ftACuNMZgOFFV9Wpj/
         PB5KLAEW24ruT1Yzz/x68aj7gWofNR4W79kQ2s9eyuJYNHcBiK4ncmEElm57t2kqdJf/
         dZyKyqufwdFwlRpuKlezzJt5WGygOqKRJK168ZkeLu5hUGtug6g0ZRUEVMHpRcA6MMxK
         Wu2A==
X-Gm-Message-State: AGRZ1gJwJzG+/+4pRY+fruPrVGwzbttst2m41bNshjx5ZeGjmeCK5f4U
        gA2PXj5Y0rIi7rX1WHY71c8bNZT6
X-Google-Smtp-Source: 
 AJdET5c7BQV+0ZnBv6xEjvaHw+7W5k0p6yhlaKC3+xik/YYAnkgGTbtzgXjm089ijhmFzfsgtFvUkw==
X-Received: by 2002:a19:fc09:: with SMTP id a9mr3989985lfi.21.1540621495051;
        Fri, 26 Oct 2018 23:24:55 -0700 (PDT)
Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se.
 [80.216.12.205])
        by smtp.gmail.com with ESMTPSA id
 c81-v6sm2097487lfe.79.2018.10.26.23.24.54
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:24:54 -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/78] config.txt: move pretty.* to a separate file
Date: Sat, 27 Oct 2018 08:23:24 +0200
Message-Id: <20181027062351.30446-52-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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/config/pretty.txt |  9 +++++++++
 2 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100644 Documentation/config/pretty.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index a7b72d2722..d55776c383 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -381,15 +381,7 @@ include::config/pack.txt[]
 
 include::config/pager.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::config/pretty.txt[]
 
 protocol.allow::
 	If set, provide a user defined default policy for all protocols which
diff --git a/Documentation/config/pretty.txt b/Documentation/config/pretty.txt
new file mode 100644
index 0000000000..063c6b63d9
--- /dev/null
+++ b/Documentation/config/pretty.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 27 06:23: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: 10658171
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 3A03113A4
	for ;
 Sat, 27 Oct 2018 06:25:01 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 268D62BF74
	for ;
 Sat, 27 Oct 2018 06:25:01 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 1B21C2BF91; Sat, 27 Oct 2018 06:25: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 5A8F92BF74
	for ;
 Sat, 27 Oct 2018 06:25:00 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728500AbeJ0PEw (ORCPT
        );
        Sat, 27 Oct 2018 11:04:52 -0400
Received: from mail-lf1-f67.google.com ([209.85.167.67]:34831 "EHLO
        mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728259AbeJ0PEw (ORCPT );
        Sat, 27 Oct 2018 11:04:52 -0400
Received: by mail-lf1-f67.google.com with SMTP id d7-v6so2494451lfi.2
        for ; Fri, 26 Oct 2018 23:24: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=cnkd3x3pdqHZSBmE35NyqcxDv/tej/2bqZyDvDZ682E=;
        b=iJrt03y/q8mqHNtKVONOwDSEgylgT85Mrt00p0EjUbKYeNiHJirv7OMQbUhAZcx4FW
         GeQg1D2DI72i/2JIiNLY5/XMxq9hTvZtptbO0BM51mDgXgu5NTcH88NTGdKH8hzbFh/c
         urxVFBWjV//RIZJ53g6AXaQHbY+Pm5f19bfafIQYSUpLSHXW9LV+4mln+k1GT3EIiaiX
         EbSLk8hxCWFyMvqacZwTrzyL7st9oEyIcGLQZnkoEMNn96PKz0/eU+kvOfxcH/N89teh
         KXI+jfVj4u9OzUp8Dds2fPtghLCeIjJQWIxqQvSy53YhVEYxfXeV3jEoDcDOSxJ+M31j
         YJbw==
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=cnkd3x3pdqHZSBmE35NyqcxDv/tej/2bqZyDvDZ682E=;
        b=pHdTdz4VXM+Md68LNlEkKI7wBfxJTp2HaDLJG+n1RSc1qp/u+6SjfJC41irzbRkMlM
         w3ELTIhjAtxSNYfq8WDjLc/aAv7nDWXI6jp0GoW8Q4U+32fc3S/Q+I9nQF7EBPh/QZp/
         I5STBUZSMTjQZviRjP3iAAUGHJ93J1czR2OftQGhzrM6FP88w1Xnx8p+/462OfR2zT8L
         nnvob5nYVSruwagCYev4yiBMPcSOravb6HknPOg6rM/oyNUzz7f2GzpTtFdSBXV7lfGX
         9GiJaBc9y2MXD2vsC0LGeWgb46wACPPNpewRTBciHJG1FgGLM87jcA3zOtwTumaSXtGt
         tzog==
X-Gm-Message-State: AGRZ1gK+5IibdpHNV7tRORf7VO2vo0Ee6Ef6fxL6kWpBBJEbhO4nJTBO
        mBBpYUMQpO0VX7AxIFPzPTrJEl4v
X-Google-Smtp-Source: 
 AJdET5dWlJSljG2LCeuwiD8ZiXBMgYnCZ7DiI9rL0Km7eMIEjHbRh8BB8Glh9EJBG+4qpKySE3UhlQ==
X-Received: by 2002:a19:53d9:: with SMTP id
 h86-v6mr3993969lfl.75.1540621496243;
        Fri, 26 Oct 2018 23:24: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
 c81-v6sm2097487lfe.79.2018.10.26.23.24.55
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:24:55 -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/78] config.txt: move protocol.* to a separate file
Date: Sat, 27 Oct 2018 08:23:25 +0200
Message-Id: <20181027062351.30446-53-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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/config/protocol.txt | 64 ++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 64 deletions(-)
 create mode 100644 Documentation/config/protocol.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index d55776c383..e80148a133 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -383,70 +383,7 @@ include::config/pager.txt[]
 
 include::config/pretty.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::config/protocol.txt[]
 
 include::pull-config.txt[]
 
diff --git a/Documentation/config/protocol.txt b/Documentation/config/protocol.txt
new file mode 100644
index 0000000000..bfccc07491
--- /dev/null
+++ b/Documentation/config/protocol.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 27 06:23: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: 10658173
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 7E7F95A4
	for ;
 Sat, 27 Oct 2018 06:25:01 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 660D12BF74
	for ;
 Sat, 27 Oct 2018 06:25:01 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 5A78F2BF90; Sat, 27 Oct 2018 06:25: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 005722BF7B
	for ;
 Sat, 27 Oct 2018 06:25:00 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728504AbeJ0PEx (ORCPT
        );
        Sat, 27 Oct 2018 11:04:53 -0400
Received: from mail-lj1-f194.google.com ([209.85.208.194]:44836 "EHLO
        mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728465AbeJ0PEw (ORCPT );
        Sat, 27 Oct 2018 11:04:52 -0400
Received: by mail-lj1-f194.google.com with SMTP id v6-v6so3085192ljc.11
        for ; Fri, 26 Oct 2018 23:24: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=6/gl0QGtPHkG8s1SAVVrWq2R5FCVwttuxecKisKK8Jw=;
        b=K6y/oRkquM9LxlS78nPEW3fgDp/pJRuNTotUzOA7v+qxf/839P8HrNhIPRqlPSe7b1
         cezx22+sZs3KUBY4GGcAa7xEtHPnMHbQ80WxiFCT5PMZYmeTFxN90PpDq/ADxYEMHfSE
         sv2S47IHADUJbXQCDn95EgfLMjmcZu+I/zDco40w/qB5FWMcF/Oreuf4SgTTIJKvibhk
         i00R3dPmTH8XACml2NTYk6Df9laSeaICXjkuqLxwU2FDGoxNNA+Oz7SiCwpSgLHDcDt6
         Ybl4nH7C/SlFcn55ffTTAk6c/XXqaMJBg+hK1bPwcEHeqhIzDr+FCxKnTDfWpyuseJfZ
         U+/w==
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=6/gl0QGtPHkG8s1SAVVrWq2R5FCVwttuxecKisKK8Jw=;
        b=Mw2BVndWLU/yqGPaLgBMa0pvZydWlB04YJREPNPyjSc67D/kdFwkL1EMxYMzx4jW/E
         Iv/ofz1QKE6rxIMnZwf+ErGTSYJGXSf7iV5AKePc9oMdlWB3x9MiG5K+jCkHzsd9DSxe
         tIn0sT/zwtmSmeFTj543cexkuPYNtF+Rvl5nejwxe3yzIlmi9ItdlF2mejnrbtTZZ2Gw
         ZkRrmWhZGnSAjQPOwS7ZatRVYFAzK7XOVco3N0I9xgOjtH/uK6Tgn+zWOL1IyriKMUvy
         CL4RSm1ZPY9xYsg0nLreNdgxdIya7x0WJjUP/45ZpYFmGz4QP21B5E4/d3z/OMYBnJUY
         JvpQ==
X-Gm-Message-State: AGRZ1gKlmlBelg8U5txLS8otMSit/s7bak8HpLyTi4e2/vC3Mh5GeOwU
        a6P/hGGtDx9d70+3N4VcjsSTj9U1
X-Google-Smtp-Source: 
 AJdET5ficXR5aV+d8EnBeVGOHJryx+viS3Vao5632RRZOrF2lwAYnEyxYl5Z3ZGNUO0jlhUG5wykDw==
X-Received: by 2002:a2e:5703:: with SMTP id
 l3-v6mr3541857ljb.106.1540621497265;
        Fri, 26 Oct 2018 23:24: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
 c81-v6sm2097487lfe.79.2018.10.26.23.24.56
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:24: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 53/78] config.txt: move pull-config.txt to config/
Date: Sat, 27 Oct 2018 08:23:26 +0200
Message-Id: <20181027062351.30446-54-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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                           | 2 +-
 Documentation/{pull-config.txt => config/pull.txt} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename Documentation/{pull-config.txt => config/pull.txt} (100%)

diff --git a/Documentation/config.txt b/Documentation/config.txt
index e80148a133..9de16a498e 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -385,7 +385,7 @@ include::config/pretty.txt[]
 
 include::config/protocol.txt[]
 
-include::pull-config.txt[]
+include::config/pull.txt[]
 
 include::push-config.txt[]
 
diff --git a/Documentation/pull-config.txt b/Documentation/config/pull.txt
similarity index 100%
rename from Documentation/pull-config.txt
rename to Documentation/config/pull.txt

From patchwork Sat Oct 27 06:23: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: 10658175
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 C7BF15A4
	for ;
 Sat, 27 Oct 2018 06:25:02 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B2B142BF74
	for ;
 Sat, 27 Oct 2018 06:25:02 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id A2ACC2BF90; Sat, 27 Oct 2018 06:25:02 +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 4EF272BF74
	for ;
 Sat, 27 Oct 2018 06:25:02 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728508AbeJ0PEy (ORCPT
        );
        Sat, 27 Oct 2018 11:04:54 -0400
Received: from mail-lj1-f196.google.com ([209.85.208.196]:39221 "EHLO
        mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728501AbeJ0PEy (ORCPT );
        Sat, 27 Oct 2018 11:04:54 -0400
Received: by mail-lj1-f196.google.com with SMTP id a28-v6so82749ljd.6
        for ; Fri, 26 Oct 2018 23:24:59 -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=qKiWqzUwcGbaOCev4ng2Lokcv5gnlZdU/uTYCqwnE6w=;
        b=NQFjFp7vogKT3ZU0827O0bXscBtsFuEbtvFgJRPDJEYm7SGrJ6vwpgscM+OGjdu7ld
         xiAlwDWSJ561/6HGPVyulqPBndMoqPj5SHd6lbJ7gdZ8CZQzfXww5qGemo951E0YtYyh
         GRiBfVlkNocbrgdsUEvgikDONl+IRg2UM7IJiV8vKYUDDQMfR0Nbk2mkOJrp3PNe7Wm5
         tiHa21Fg/ui6eyB4oU2uwybR5KLTJPyYnLJTdxAIKIPwaPLfCryRh5gRe82jSRTkffZB
         KlxS1hlLrurwfwgFZ5H9h5TLcGa3YZ3dSNX8VcxhxGWwuqBRJOXYHSgzSROxFG4eoZsq
         V8mQ==
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=qKiWqzUwcGbaOCev4ng2Lokcv5gnlZdU/uTYCqwnE6w=;
        b=hIjHgt4kHSHIwC4x1iU+/IgG+fw04PWHSeBXHeIjZOpqKUP6/PRSLZxWvLQD4tk7ZY
         t904gsdz99RdNACkjB23GdfIS21+s73qnuVuczp2Mm5FrxbWVN5Uxub9pi0sjYnHVQ8U
         ea5KnomgZYqxY4vOngjApSxZnHSIXgBwECbWWh3rXP23FkhttWVktbIWpWGs/EkAK2Fx
         wwPj5wW8JcNeNEJ77eB/Kb9zC/pxtqPUxH1rhwY3MWNDzVQDFQ1lCmPaspsQ/5HhcaAg
         9HWMn1GzgjOEOoLAGNYGTn0fdowEx3NU8deFOgOUU04kj+/rcKmJ89yDPi1/VK17af+5
         YJbw==
X-Gm-Message-State: AGRZ1gKFlXMGpGkWhKn0EQywRRQmd5LiWkuUE6tPgAQ1JXUHL4TmgSBq
        y7rS/YwgQVyWaV2fz9UQFZUt+Jmg
X-Google-Smtp-Source: 
 AJdET5dd0FywFNaFv5sRnnojHSMNV/3BqfAXqFgI8/JHTeNPZU8Yyiuqkbxyq2NWONQI0VZ51INKIA==
X-Received: by 2002:a2e:8743:: with SMTP id
 q3-v6mr4475501ljj.80.1540621498346;
        Fri, 26 Oct 2018 23:24:58 -0700 (PDT)
Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se.
 [80.216.12.205])
        by smtp.gmail.com with ESMTPSA id
 c81-v6sm2097487lfe.79.2018.10.26.23.24.57
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:24:57 -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/78] config.txt: move push-config.txt to config/
Date: Sat, 27 Oct 2018 08:23:27 +0200
Message-Id: <20181027062351.30446-55-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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                           | 2 +-
 Documentation/{push-config.txt => config/push.txt} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename Documentation/{push-config.txt => config/push.txt} (100%)

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 9de16a498e..a6934fd87b 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -387,7 +387,7 @@ include::config/protocol.txt[]
 
 include::config/pull.txt[]
 
-include::push-config.txt[]
+include::config/push.txt[]
 
 include::rebase-config.txt[]
 
diff --git a/Documentation/push-config.txt b/Documentation/config/push.txt
similarity index 100%
rename from Documentation/push-config.txt
rename to Documentation/config/push.txt

From patchwork Sat Oct 27 06:23: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: 10658177
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 71B7413A4
	for ;
 Sat, 27 Oct 2018 06:25:04 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5EFB12BF74
	for ;
 Sat, 27 Oct 2018 06:25:04 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 53B7F2BF90; Sat, 27 Oct 2018 06:25: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 0ABA92BF74
	for ;
 Sat, 27 Oct 2018 06:25:04 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728307AbeJ0PEz (ORCPT
        );
        Sat, 27 Oct 2018 11:04:55 -0400
Received: from mail-lf1-f68.google.com ([209.85.167.68]:45249 "EHLO
        mail-lf1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728265AbeJ0PEz (ORCPT );
        Sat, 27 Oct 2018 11:04:55 -0400
Received: by mail-lf1-f68.google.com with SMTP id c24-v6so2470291lfi.12
        for ; Fri, 26 Oct 2018 23:25: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=NS1HfjorPQpbryitWHwOpE6pP5rkH2B4Kg9deze+BJM=;
        b=fE8h0PO9MuxvFmuiDEL1xG7uVqX6C89KLSglG8UVqXvT0M/8kZsv3bxZR0GpLgkL2/
         O/RIS3OisXFCTAznkJDoyif927wEnIBDaSoN0QXHS9oEAzGEwIVQBvc5t14AqWqAVqbD
         UkjkoSW9ijEbp8xYidX3mWqYxH9JBkX7H0qGzXGdxww+MTyoOUvQRTLLC1ZP08LXhGGI
         X6zNLUU4r3xk6GJC5PN9r9QGca2YsttN0WxquH1tY/yyZYpjvrV/g04/rL5mF5uZ+WjK
         e0ps9iqwvlsUPBF7Xg1cKg/+djBzNzVwADGN3dt6VZzXx6G23jIG8u58q1vXpphClM9Z
         QGyw==
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=NS1HfjorPQpbryitWHwOpE6pP5rkH2B4Kg9deze+BJM=;
        b=JlaCXMmSgU0LMh/ByeqhXRGrl4u+R8MHxqaWXoU519F00pJSIhRReV1rMPZUFn5CvI
         nRLQfnriJfjYxp2zF7Man9MVPzbhvBWSbhWwrK+3IN85xBkTedVoD4g7kWq7czhEolcx
         uBAZbXdugjS01z9KGmqIhDE5HI8jF+3qli94nQWnsH/kwqXp3pnNEq6QHMeUYeDlno+V
         dVL0ucUu+2R+ncWYD7ObzAd7omDzUJwROxGLfbCogsVU2aoqHQxaClrp+qETYFDnzLrH
         706j64u4LsCxvlvRTunxONzgw0zMi7sOm3CvbLSpOXA0srTym7cbh+AT79dvrvWXrwb6
         X4OA==
X-Gm-Message-State: AGRZ1gL5GDgIdrZgQ/FASY16mMn/ZWF3OS321grSSmy6wR4OXgBIgiEg
        3ks8t2uwlkHtS0XlL+Vx+VRVE0sP
X-Google-Smtp-Source: 
 AJdET5db1jL4j3M8bq878vCySDM3lrQTylYZ5f+n9qUYDGVJeazJHi4Ek3x9ifiEVB3r7ZUp9Khp6w==
X-Received: by 2002:a19:6e0b:: with SMTP id
 j11-v6mr3666582lfc.118.1540621499279;
        Fri, 26 Oct 2018 23:24: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
 c81-v6sm2097487lfe.79.2018.10.26.23.24.58
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:24: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 55/78] config.txt: move rebase-config.txt to config/
Date: Sat, 27 Oct 2018 08:23:28 +0200
Message-Id: <20181027062351.30446-56-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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                               | 2 +-
 Documentation/{rebase-config.txt => config/rebase.txt} | 0
 Documentation/git-rebase.txt                           | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename Documentation/{rebase-config.txt => config/rebase.txt} (100%)

diff --git a/Documentation/config.txt b/Documentation/config.txt
index a6934fd87b..0079cb31ff 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -389,7 +389,7 @@ include::config/pull.txt[]
 
 include::config/push.txt[]
 
-include::rebase-config.txt[]
+include::config/rebase.txt[]
 
 include::receive-config.txt[]
 
diff --git a/Documentation/rebase-config.txt b/Documentation/config/rebase.txt
similarity index 100%
rename from Documentation/rebase-config.txt
rename to Documentation/config/rebase.txt
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 432baabe33..e98d1ac8ae 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -203,7 +203,7 @@ Alternatively, you can undo the 'git rebase' with
 CONFIGURATION
 -------------
 
-include::rebase-config.txt[]
+include::config/rebase.txt[]
 
 OPTIONS
 -------

From patchwork Sat Oct 27 06:23: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: 10658179
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 0B13514E2
	for ;
 Sat, 27 Oct 2018 06:25:05 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EC18A2BF74
	for ;
 Sat, 27 Oct 2018 06:25:04 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id E0A522BF90; Sat, 27 Oct 2018 06:25: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 91BE32BF74
	for ;
 Sat, 27 Oct 2018 06:25:04 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728501AbeJ0PE4 (ORCPT
        );
        Sat, 27 Oct 2018 11:04:56 -0400
Received: from mail-lj1-f194.google.com ([209.85.208.194]:45808 "EHLO
        mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728465AbeJ0PEz (ORCPT );
        Sat, 27 Oct 2018 11:04:55 -0400
Received: by mail-lj1-f194.google.com with SMTP id j4-v6so3090235ljc.12
        for ; Fri, 26 Oct 2018 23:25: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=JV8cwwIPeDYFQDL05hJYKYjYnkn333ZnBbKkbbXtYTo=;
        b=riqmM6RCKIjM6/70wnfgF3Ig2qhKRf0b+pVBbGPsGQkmJL/7UTIzuhw7ZgkHPxlu3J
         3mPWNLiL4yb0V67Tw0kiaHRG0rzz4ZuweHMNWVjlPHDGAQ75IhhZnTsKUs8es8Ysh1R5
         01RqsIVprQoTK6yYEiuvrwL4cO4+rZhbs4fpcM0jrW8elCLaRzXMpLXUxjlX3V8Lpxxn
         wsPQfwfQRaZEOUr6GfMX2CLgb1RP1ayBE9knrpuxoNniW69tXCyy0e62pdjyxhuwlsyC
         rfYpOi6TJ7ghkXnPsj2SR7bkXI6jEHkPH9eaK4i3U/rY1bciZJDPkQzmtkoWFH2qV7SL
         9IKg==
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=JV8cwwIPeDYFQDL05hJYKYjYnkn333ZnBbKkbbXtYTo=;
        b=i2ec1VoGuRaGQ8d0rVlSJFaOKPXj6FZ1e7AhlIupMCBgD4C6BojJj0A1FDfprbDcxl
         QAjgzSRXm2s1iYQHbx/ppwMDFEAXbCOxYO4iCdot6h3LG3yMV7iKIW1axCKsRzseufN7
         9/9SoOK5KrIg/pcd2E7CiQ7eir4NNkaLNzZsTHU46IvvFuxE3PzmxOXUpauXJVtdoZYp
         3lPE3+6HSRJArezdTxecK7nQX7GPs+N4G51Loe+pRr27j6k2QH/pq2llREB7I8jRnjUa
         Bt+XYMhSHHCeHMD336YCUHaP/SPBC407YfP1srq9oZuO3AHOQMdB1rvp0obbUC/LUxf/
         T5sw==
X-Gm-Message-State: AGRZ1gLOUH1m6W5328TP39mjzt8y/Ru8laEqZATG88okD1GtgjMOE5JJ
        gW+ei2h5fcpm+fwp4tcifKN2l0Uw
X-Google-Smtp-Source: 
 AJdET5cth87P4IA12OIUXoABVpONOwnjAJZt12sMnuApvVMaCl9TxttQcB//frrHYUDUBrCs1XvmrA==
X-Received: by 2002:a2e:2b46:: with SMTP id
 q67-v6mr4090435lje.126.1540621500396;
        Fri, 26 Oct 2018 23:25:00 -0700 (PDT)
Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se.
 [80.216.12.205])
        by smtp.gmail.com with ESMTPSA id
 c81-v6sm2097487lfe.79.2018.10.26.23.24.59
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:24: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 56/78] config.txt: move receive-config.txt to config/
Date: Sat, 27 Oct 2018 08:23:29 +0200
Message-Id: <20181027062351.30446-57-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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                                 | 2 +-
 Documentation/{receive-config.txt => config/receive.txt} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename Documentation/{receive-config.txt => config/receive.txt} (100%)

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 0079cb31ff..465dc2abec 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -391,7 +391,7 @@ include::config/push.txt[]
 
 include::config/rebase.txt[]
 
-include::receive-config.txt[]
+include::config/receive.txt[]
 
 remote.pushDefault::
 	The remote to push to by default.  Overrides
diff --git a/Documentation/receive-config.txt b/Documentation/config/receive.txt
similarity index 100%
rename from Documentation/receive-config.txt
rename to Documentation/config/receive.txt

From patchwork Sat Oct 27 06:23: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: 10658181
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 867125A4
	for ;
 Sat, 27 Oct 2018 06:25:07 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 71CA52BF74
	for ;
 Sat, 27 Oct 2018 06:25:07 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 665652BF90; Sat, 27 Oct 2018 06:25: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 BBFA92BF74
	for ;
 Sat, 27 Oct 2018 06:25:06 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728511AbeJ0PE7 (ORCPT
        );
        Sat, 27 Oct 2018 11:04:59 -0400
Received: from mail-lj1-f195.google.com ([209.85.208.195]:33346 "EHLO
        mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728258AbeJ0PE6 (ORCPT );
        Sat, 27 Oct 2018 11:04:58 -0400
Received: by mail-lj1-f195.google.com with SMTP id z21-v6so3126917ljz.0
        for ; Fri, 26 Oct 2018 23:25: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=4d6YDHFBfDMFi+TZDIrT97tJmdS5fZm/ztrqyBCqdTw=;
        b=qF+ArwBX7d+JeO28j2ITkE4BQYQnTu6/eqGW8G43imlTxy/Gy6eXgwkr3lsMZQUehK
         146A0qxe0b0k3OkAhTNoUby+O+7+jZdGVzO7TV+FsJB2CVePHAC7oboDHcfIfSIBw6cm
         4jEvC5aQnZjwHTHo8VwUdd0yToSBpz2p8bLGagcTYh86tuqhDf6gi8BYZ9UWJN2gYl0/
         bRMcdaQgbyOWJiSTdbadAnos0LAiyfKOESBz/MvwTIa1ex1fA5a8EjwD9Gx63zWEQbi7
         9mLBPJ3XEpSyZyhSkJFKDCdz8suJVvrZ08vN7AwmGpFrdrpvAN1WNGeVE+fcE4GoK4Jy
         3w/Q==
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=4d6YDHFBfDMFi+TZDIrT97tJmdS5fZm/ztrqyBCqdTw=;
        b=nK0BPuXRqKAjqWHOAORcatXx9CB1faWGsxYZkh7CIljTMolhg0TIc/yPA11By3P0zT
         KmwxgSazUQqxktfheRTRYZubEYtO5ibt20o5D3Ex1/VsMSf8UXoO+JXS6YRDzO4Fob6h
         YX3C9fT7YvDoz2ohxYtH2E0kuNd1dTDq1cImOYu8YNBFG/vbUvddgIPCbEZ1gjTB8Vig
         7tHVlo1A5SkyoFQsjFdFSVgtztacGhiWfQqg7GhX9CrT0Omu+vTb+kFTwxDgbyvxTWMy
         2l6rKQRUlCNIHAvZTh3tdMgkIA0qZCt9jU71pOA/rv/OcaCUdB5KZRyBm3gmK3PJOWuK
         Iilg==
X-Gm-Message-State: AGRZ1gKzc9Fr+sPZyz3hEbvW0yE5V48C2cQFq7oQ9GyEzcIsJTx0ONrq
        CW+XeZU07Dqb36ERa6J6Wy6zob8P
X-Google-Smtp-Source: 
 AJdET5eblEd2GW/WI7INSpSFB8t+m0bPdcQnBmZd+EL8MxCBGlxEs57BTzjdmpj05/yEEHL7/M4jMA==
X-Received: by 2002:a2e:83d7:: with SMTP id
 s23-v6mr4566634ljh.0.1540621501617;
        Fri, 26 Oct 2018 23:25: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
 c81-v6sm2097487lfe.79.2018.10.26.23.25.00
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:25: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 57/78] config.txt: move remote.* to a separate file
Date: Sat, 27 Oct 2018 08:23:30 +0200
Message-Id: <20181027062351.30446-58-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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/config/remote.txt | 78 ++++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+), 78 deletions(-)
 create mode 100644 Documentation/config/remote.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 465dc2abec..b7aafdbf17 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -393,84 +393,7 @@ include::config/rebase.txt[]
 
 include::config/receive.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::config/remote.txt[]
 
 remotes.::
 	The list of remotes which are fetched by "git remote update
diff --git a/Documentation/config/remote.txt b/Documentation/config/remote.txt
new file mode 100644
index 0000000000..6c4cad83a2
--- /dev/null
+++ b/Documentation/config/remote.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 27 06:23: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: 10658187
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 8EC485A4
	for ;
 Sat, 27 Oct 2018 06:25:09 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7BC792BF74
	for ;
 Sat, 27 Oct 2018 06:25:09 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 6FED52BF90; Sat, 27 Oct 2018 06:25: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 12C3C2BF74
	for ;
 Sat, 27 Oct 2018 06:25:09 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728242AbeJ0PFB (ORCPT
        );
        Sat, 27 Oct 2018 11:05:01 -0400
Received: from mail-lj1-f193.google.com ([209.85.208.193]:36260 "EHLO
        mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728257AbeJ0PE6 (ORCPT );
        Sat, 27 Oct 2018 11:04:58 -0400
Received: by mail-lj1-f193.google.com with SMTP id s15-v6so3127361lji.3
        for ; Fri, 26 Oct 2018 23:25: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=ZEJtaCxh1kaFCcVvc1f19YpqcFQabsG/6JbXRaXkR8E=;
        b=X2Y7Gf/dzHWJ4itwL3r0EollEJJVBTP3Z2WhWBo4v/e7nEelwCCTZFfSGSUM8UdPa2
         Uhr9QfEFJq+Fg3bapi1GGnz6WL398+TsLQvdK0k+uzhHyiCLxXLunUiXSVrzL6MlJbAf
         TnRkxmR44LNp3LYvl5TWaBEaGZAlIvQRPv6cWJXfjHmwDZda35ryOIm70z+/JL9/Z3rY
         W4BGKX3jeFNlqQDiZ5GO/mGuN4fpqGCXX+RY2NdL+cxO/+JwBnkeyR8DsHX0Uxv/sg40
         8ysXeyTPC9K7U1prL8UWDNlrEvmbfJj09f3X/sbhMkk37BEUNRTs73rZAPAIhncSycyV
         bC1Q==
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=ZEJtaCxh1kaFCcVvc1f19YpqcFQabsG/6JbXRaXkR8E=;
        b=V5V84EeGlpr/AFIMm/1rjB7mwoa+BLM4jyLdX3p8WOFgQ0fwome8QWInxdhblVwnP9
         xFvZ9p8U2zggNSeQOM50tOWO9zv9WS2ctByr7FR9n0/TpgCRD+RmYnf1ClmcaF6AJMig
         3EarcInZM/2IXH9psMAiU1LOHyQd67OWSJUlrkkFh0fsiMqrlXoS4Wlo6KyZwY0mAvGp
         /vacwgv9yx2w8xR3dCk0LmD354pNsHlCQ+3ZhHb2CX5EHjpwtyhmWov3s8Fp/dMTtAHV
         YB81OfhAHXvZDjG0p8JQURoSvs/IjvtsISkyOxpc9mtJOmmVUMNYHCr1jtRusiLyYO6V
         +RfA==
X-Gm-Message-State: AGRZ1gI6SeI0gTJKnmRv7e0fIZUXR7WsNHn0+1930UiqpN30cfdS5srG
        ygUwVdTpqIH9c3W7eS6yjkKkCG8u
X-Google-Smtp-Source: 
 AJdET5fp/Czc7StcCkPN93ugjBEG51Lgw62txNWbY/RUTRP3UvSbP6E/V49CP83vJ4sienTaR84E1Q==
X-Received: by 2002:a2e:5d8f:: with SMTP id
 v15-v6mr4470203lje.86.1540621503330;
        Fri, 26 Oct 2018 23:25: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
 c81-v6sm2097487lfe.79.2018.10.26.23.25.01
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:25: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 58/78] config.txt: move remotes.* to a separate file
Date: Sat, 27 Oct 2018 08:23:31 +0200
Message-Id: <20181027062351.30446-59-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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/config/remotes.txt | 3 +++
 2 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 Documentation/config/remotes.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index b7aafdbf17..9aa849ce8b 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -395,9 +395,7 @@ include::config/receive.txt[]
 
 include::config/remote.txt[]
 
-remotes.::
-	The list of remotes which are fetched by "git remote update
-	".  See linkgit:git-remote[1].
+include::config/remotes.txt[]
 
 repack.useDeltaBaseOffset::
 	By default, linkgit:git-repack[1] creates packs that use
diff --git a/Documentation/config/remotes.txt b/Documentation/config/remotes.txt
new file mode 100644
index 0000000000..4cfe03221e
--- /dev/null
+++ b/Documentation/config/remotes.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 27 06:23: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: 10658185
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 EC5A414E2
	for ;
 Sat, 27 Oct 2018 06:25:08 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D65DF2BF74
	for ;
 Sat, 27 Oct 2018 06:25:08 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id CA8212BF90; Sat, 27 Oct 2018 06:25:08 +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 5EA922BF7B
	for ;
 Sat, 27 Oct 2018 06:25:08 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728515AbeJ0PFA (ORCPT
        );
        Sat, 27 Oct 2018 11:05:00 -0400
Received: from mail-lj1-f196.google.com ([209.85.208.196]:44845 "EHLO
        mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728465AbeJ0PE7 (ORCPT );
        Sat, 27 Oct 2018 11:04:59 -0400
Received: by mail-lj1-f196.google.com with SMTP id v6-v6so3085357ljc.11
        for ; Fri, 26 Oct 2018 23:25: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=ObmG/6lFfqXhbh6H0yTdozyNtVpj9GT7/wfaNAp6wfw=;
        b=nj7C/UtJaBva7IcQU8tWEFCSoZ324EjoNdCtrHkHjDxaA4i9sTu4jpBdIkBA6qgHVM
         G1VFMTNyjNHE2hHgjUWf9kP9qCS5Z8N+lqOSvFf/2q7JO0kxv3OalKm/OWd0V6lDEmgm
         iZ9dGEWOsTFQMsTWrsD9l475oww78iayGuwRn5ui3QKyOduiCIAqwIiNNIvE9idFDGws
         xaHkNE0GBbnXC9kAAlDX0zInNsAySN3y7lAyl0Rj8FYYVGhHszhwT/tKg9Oyq5DTdYY6
         Ror0uwB8J/BsWDjW65r60UWNN3/3pB/nu512lcT9mlKpHskig3S/KxdzvWY02cN1UhTx
         5esw==
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=ObmG/6lFfqXhbh6H0yTdozyNtVpj9GT7/wfaNAp6wfw=;
        b=oinnBAuULtgbFGwVVF0RzdbWyZy8JlXtkXxeG0dqV6yEF2+flJUDH1CscoTd6UY1a8
         q6koL+yNikE6NKQaCeLNmmszdefbtIA+1lndLHpizQ+/5FEYwVECb9h8007YpYuY3Z/3
         vIYc+aUWFD4TgQX/WQRc+1QyQP3R77GbfA0JRYaRu2oArfBSRb4uLCrGjazj/BNa/kXe
         mMSKsSGAVOhVhR5+K6Lsu+oUD9kpH/5tK8E9VaeS4s0eqwDMYyW+nz1+bOs8m8fCNhhu
         tmWup70vDgoGllwulmpmNthDR7qKJKYuSflNZY3axEJWOSdh68jGo4Jr53XWTvYy2Baw
         ecdw==
X-Gm-Message-State: AGRZ1gJFv03ZeAOOb+OeWf90fObe8/b9yYqMHVEhJpo1iOKVk2DGUOLl
        Rad33nuG1SECKgOOI0x+tDR6lP+5
X-Google-Smtp-Source: 
 AJdET5d3a86nvONRCcAsQ+vzc0UPSjBQWceLklFZzWfV0x+FtwUn8nz0wTKJhPmlIaBZaJ2qRd4QQA==
X-Received: by 2002:a2e:84c5:: with SMTP id
 q5-v6mr4020609ljh.65.1540621504507;
        Fri, 26 Oct 2018 23:25: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
 c81-v6sm2097487lfe.79.2018.10.26.23.25.03
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:25: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 59/78] config.txt: move repack.* to a separate file
Date: Sat, 27 Oct 2018 08:23:32 +0200
Message-Id: <20181027062351.30446-60-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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/config/repack.txt | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 27 deletions(-)
 create mode 100644 Documentation/config/repack.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 9aa849ce8b..0ce5081f22 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -397,33 +397,7 @@ include::config/remote.txt[]
 
 include::config/remotes.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::config/repack.txt[]
 
 rerere.autoUpdate::
 	When set to true, `git-rerere` updates the index with the
diff --git a/Documentation/config/repack.txt b/Documentation/config/repack.txt
new file mode 100644
index 0000000000..a5c37813fd
--- /dev/null
+++ b/Documentation/config/repack.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 27 06:23: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: 10658189
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 1833B13A4
	for ;
 Sat, 27 Oct 2018 06:25:11 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 04A162BF74
	for ;
 Sat, 27 Oct 2018 06:25:11 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id ECA442BF90; Sat, 27 Oct 2018 06:25:10 +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 944242BF74
	for ;
 Sat, 27 Oct 2018 06:25:10 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728521AbeJ0PFC (ORCPT
        );
        Sat, 27 Oct 2018 11:05:02 -0400
Received: from mail-lj1-f193.google.com ([209.85.208.193]:44844 "EHLO
        mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728258AbeJ0PFB (ORCPT );
        Sat, 27 Oct 2018 11:05:01 -0400
Received: by mail-lj1-f193.google.com with SMTP id v6-v6so3085379ljc.11
        for ; Fri, 26 Oct 2018 23:25: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=9+Rgr5ff/A4w9c0GFILNUvuu7mj9coxjOP3ODUcpIKo=;
        b=vBwWa7irPU5iCbvNO6E/8151L85kl8k0JCFc8hL/raXOFh6o7P9nAjhfqWSxmwQezr
         FeKrmQlFhTiGC9SyMOJEvJ1VlIC4Hth/2b16Nqn+vSDQDgqWei3Do6jGnr9/K1M1jeQS
         CuYf/FHQlEzQ9YsCX5SwYpje5P1eCNgj5hCiiG8U0mAPaqQRA8NLkKuW7mdjjRZR8wSe
         iuwJsxQ19OlW8LYn8Qx/khN45MLbXW4khkAVTKOFJl+vt7ANmDCy33SnuUBLgffwirSW
         DXWFsr/BLDYO10013ZFbMRNKS+tggucDz7nOvJRAXMZwhcbL+OOEKeSfQiKr+YvzFG/p
         yamg==
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=9+Rgr5ff/A4w9c0GFILNUvuu7mj9coxjOP3ODUcpIKo=;
        b=L7kdHnclnsnR+21+Udhhjf2WW03aDdaIeBAlo3tlBUp3+mICChzYHQoFyo4FjANZXO
         wpMzi+xyEkeLXmt/r0D1ybC2RcDcsxonm/eWVvGF/vjFyWfW6dN8pom0u2KOd4xSdk/Q
         6ErWv2OmV4jxmIlKiFyVLiTkttpiUkcCvnzTy/vj37BtEDyA1HG31k7WIWW102XRQzb3
         IDRZXKfQrFEkCZ9OjJz8H9X2bppYH/NUgYUmyCgQ2YYhlp1QiAbPwRbnvRMaNlzYJtPY
         XIWjUG+U8iCzWHLGiaFDmSfU9IBqGjm+Mu87JtxQ/FaKbuoe/c/HmwytU9CRTshp0mxF
         l8YA==
X-Gm-Message-State: AGRZ1gKYa6KrYQ7QqrJ8qsislfE7Bsdmv/8jahE4KshxuDZWQEku/mHY
        qEPBNQJgbt6UthX+zl+gW2wBoQvz
X-Google-Smtp-Source: 
 AJdET5caeJWUJl9w+UaTtTTnnx4ffap/SbD1upBGPYSvi4k3jsaD4vSHGT7ccTk8ngKk9PeZ6zmGaw==
X-Received: by 2002:a2e:9b04:: with SMTP id
 u4-v6mr1924658lji.29.1540621505584;
        Fri, 26 Oct 2018 23:25: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
 c81-v6sm2097487lfe.79.2018.10.26.23.25.04
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:25: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 60/78] config.txt: move rerere.* to a separate file
Date: Sat, 27 Oct 2018 08:23:33 +0200
Message-Id: <20181027062351.30446-61-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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/config/rerere.txt | 12 ++++++++++++
 2 files changed, 13 insertions(+), 12 deletions(-)
 create mode 100644 Documentation/config/rerere.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 0ce5081f22..71bab1f3b8 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -399,18 +399,7 @@ include::config/remotes.txt[]
 
 include::config/repack.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::config/rerere.txt[]
 
 reset.quiet::
 	When set to true, 'git reset' will default to the '--quiet' option.
diff --git a/Documentation/config/rerere.txt b/Documentation/config/rerere.txt
new file mode 100644
index 0000000000..40abdf6a6b
--- /dev/null
+++ b/Documentation/config/rerere.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 27 06:23: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: 10658199
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 3ABD413A4
	for ;
 Sat, 27 Oct 2018 06:25:17 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 280962BF74
	for ;
 Sat, 27 Oct 2018 06:25:17 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 1C64A2BF90; Sat, 27 Oct 2018 06:25: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 C30582BF74
	for ;
 Sat, 27 Oct 2018 06:25:16 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728518AbeJ0PFC (ORCPT
        );
        Sat, 27 Oct 2018 11:05:02 -0400
Received: from mail-lj1-f196.google.com ([209.85.208.196]:44847 "EHLO
        mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728243AbeJ0PFC (ORCPT );
        Sat, 27 Oct 2018 11:05:02 -0400
Received: by mail-lj1-f196.google.com with SMTP id v6-v6so3085400ljc.11
        for ; Fri, 26 Oct 2018 23:25: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=faUd2EKebhR4/6zeqqvyukphGj7aLt9iTUmZn3rDvPQ=;
        b=JO7mh6NnTHEd0LGHunHQcQpLDqVbGEcTVLgmGyuTP+gRdd8PJLBIxN0yu8/tiJOhxX
         2lB5cQPRaJ4qJHyJHejQau1CzZ6fDgectB8hjzTlsyNRkEZiL+EgbQvk/ZKsJgE3QFYz
         XVBPtEcBf4IeZxXgB22VFpchKjW+0UkFR+Dx5PZOauEqLEkkmySwA8EMyL7vXH22oiHE
         RN/ekmAlyrwcl2eBbSjUwjdgF4OrLDUJaDGd+LMWrLpjUJrvPCszpefWqRl+lQg9qG7Q
         UzEhBAR1/7PnHoOy2QUlmGJ6KoTqNoftSdspFUGUOlvIFWsXCoLDDZG17fvv2qI1Wj2e
         vYqQ==
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=faUd2EKebhR4/6zeqqvyukphGj7aLt9iTUmZn3rDvPQ=;
        b=cMX/Ekoyi3MU6DZ51HXx11+Lr08ML1Wx1KvzlL3XyywxmxMI6eVku9JOFgXf4nq+EI
         cxzV7/iClFkwq7jO7uPuyvCpFlI2YyTR/8z4fAxvF3kaygVySEyh+/UXMrIWvsIhvvdt
         haewpJfMQw/cQsg9iOBknqcAqjhC/Kt71fBTkeblV/Ebi1xDudNY7f9Wt8gArxBd759x
         dBX0MakD7+rAvi5228clOHqW1CDulJoBUmtNhIEvBADfwD3xr1mBgp8IJqeH5Ip31KDk
         QB27tWBMuCSGVNears+SNqvSiZWcCN8IqdLIb7XAjdh2v8WnE02V79oIVyxMf28cgvuT
         sShw==
X-Gm-Message-State: AGRZ1gLBcV++YcEMydqJt/dgziCmxKLkqTpxlURhS7yldyR39j9ATN0H
        ztw0yEhYYz6hM6718C/Pz+gXBCCm
X-Google-Smtp-Source: 
 AJdET5eyh5ONm8/frOLCJxGO5pjp1COiXCyDhWlFjOqdEaojza/cJS6XELDYH/tX+rRais06tnrQ8Q==
X-Received: by 2002:a2e:980f:: with SMTP id
 a15-v6mr4642614ljj.6.1540621506473;
        Fri, 26 Oct 2018 23:25: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
 c81-v6sm2097487lfe.79.2018.10.26.23.25.05
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:25: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 61/78] config.txt: move reset.* to a separate file
Date: Sat, 27 Oct 2018 08:23:34 +0200
Message-Id: <20181027062351.30446-62-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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       | 3 +--
 Documentation/config/reset.txt | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 Documentation/config/reset.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 71bab1f3b8..a6ce22a6d9 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -401,8 +401,7 @@ include::config/repack.txt[]
 
 include::config/rerere.txt[]
 
-reset.quiet::
-	When set to true, 'git reset' will default to the '--quiet' option.
+include::config/reset.txt[]
 
 include::sendemail-config.txt[]
 
diff --git a/Documentation/config/reset.txt b/Documentation/config/reset.txt
new file mode 100644
index 0000000000..63b7c45aac
--- /dev/null
+++ b/Documentation/config/reset.txt
@@ -0,0 +1,2 @@
+reset.quiet::
+	When set to true, 'git reset' will default to the '--quiet' option.

From patchwork Sat Oct 27 06:23: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: 10658191
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 A72B714E2
	for ;
 Sat, 27 Oct 2018 06:25:11 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 943712BF74
	for ;
 Sat, 27 Oct 2018 06:25:11 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 8888C2BF90; Sat, 27 Oct 2018 06:25: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 3E5E22BF74
	for ;
 Sat, 27 Oct 2018 06:25:11 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728522AbeJ0PFD (ORCPT
        );
        Sat, 27 Oct 2018 11:05:03 -0400
Received: from mail-lj1-f193.google.com ([209.85.208.193]:36264 "EHLO
        mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728238AbeJ0PFC (ORCPT );
        Sat, 27 Oct 2018 11:05:02 -0400
Received: by mail-lj1-f193.google.com with SMTP id s15-v6so3127438lji.3
        for ; Fri, 26 Oct 2018 23:25: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=EVc6mFzrVZfMW1bGolNu2CG8lq3qIiF7T2RJLAhhoTY=;
        b=aXyZeDaHhciFdtfEmI1HbRmto9itJnFUtBW9doQqA+AoDB4jhe/+ZELebnFzeXFgwH
         iZ6g9HdjY+/BsCiReYbFxuHCpVSIH9DIULEsag+L6ICq48/5d1DoLMY9gpPJLyApf2fK
         6aVqu4XK7W2iFzp3WLzYlVEPgYwyxsS1IzJB9iNjM6dO7MuUjCjFZUFBsWvfANopugRe
         tMOueoQVu/cJFN0NvwwWI/kkTwut2y5OBHf/4mfSp4VlR0r4GMN+pqO6bS7aIK+rvjC1
         2aMPByTop9aIif3krmQmsc7rTVpzvixPB+q8L+WhJZGGjxE68Oyf8A4he2f6K2lEORYx
         PqMw==
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=EVc6mFzrVZfMW1bGolNu2CG8lq3qIiF7T2RJLAhhoTY=;
        b=TuUcehiZncxR7klXvZyll3nx2+gD1sVMzfsgC3pbEFb/nhtDXAKgFtxPb0tNNhRhDE
         sVYqzghV4s0djbgtiMAfz8Yc9H4SoS9kPdfzbt+CpZo3JYeCkJHIWhxrtoeGYgadtdG2
         BzVVeGtbyg/2qfkVL31vFxzgHKS8DQsUppMQebra9XXwlM2QYFH9L8g6wfQxsEmtYLAy
         zMO1biEGnakimknz8ng4+LozuFoZr0VRB59zG4A7/ncTlC89pchE8b5LQFbyB/4o/1wX
         p8a/s9ZtQCj13wIYuLxe7p1f4qz3pUnBn4wAQKzIky1rOMHL7bUgUDdCvlL4v93nUjoZ
         iKGg==
X-Gm-Message-State: AGRZ1gJGECTvl6cNEjzIeB4jgDZvpez9i5Aeu1Uv60oLTjhccZ4ZSCuD
        gqFyI0JMi2MP62W42ukAWkzSMFZm
X-Google-Smtp-Source: 
 AJdET5fu1LapW1TruFB2I0O/f53Z5EF6Sb3Pwu9aYXygPCRu0uKCDaFperhvjN2UF9Om+yW/6RGDmg==
X-Received: by 2002:a2e:809a:: with SMTP id
 i26-v6mr2121973ljg.100.1540621507415;
        Fri, 26 Oct 2018 23:25: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
 c81-v6sm2097487lfe.79.2018.10.26.23.25.06
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:25: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 62/78] config.txt: move sendemail-config.txt to config/
Date: Sat, 27 Oct 2018 08:23:35 +0200
Message-Id: <20181027062351.30446-63-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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                                     | 2 +-
 Documentation/{sendemail-config.txt => config/sendemail.txt} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename Documentation/{sendemail-config.txt => config/sendemail.txt} (100%)

diff --git a/Documentation/config.txt b/Documentation/config.txt
index a6ce22a6d9..1c2a6ec3c5 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -403,7 +403,7 @@ include::config/rerere.txt[]
 
 include::config/reset.txt[]
 
-include::sendemail-config.txt[]
+include::config/sendemail.txt[]
 
 sequence.editor::
 	Text editor used by `git rebase -i` for editing the rebase instruction file.
diff --git a/Documentation/sendemail-config.txt b/Documentation/config/sendemail.txt
similarity index 100%
rename from Documentation/sendemail-config.txt
rename to Documentation/config/sendemail.txt

From patchwork Sat Oct 27 06:23: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: 10658193
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 2D2BC5A4
	for ;
 Sat, 27 Oct 2018 06:25:13 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1A2402BF74
	for ;
 Sat, 27 Oct 2018 06:25:13 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 0E7932BF90; Sat, 27 Oct 2018 06:25: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 AD6382BF74
	for ;
 Sat, 27 Oct 2018 06:25:12 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728525AbeJ0PFE (ORCPT
        );
        Sat, 27 Oct 2018 11:05:04 -0400
Received: from mail-lf1-f68.google.com ([209.85.167.68]:40926 "EHLO
        mail-lf1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728520AbeJ0PFE (ORCPT );
        Sat, 27 Oct 2018 11:05:04 -0400
Received: by mail-lf1-f68.google.com with SMTP id n3-v6so2486546lfe.7
        for ; Fri, 26 Oct 2018 23:25: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=N7qzB9Qe3+OoqLfXuOgTQ/Mos6HK61X6WXjZ1mPKoUI=;
        b=dJa3uEpCxoo/pYItnDE4CsPQhLCRNj0iiildqmOAM5WFXmNt6XbgOSd+Tna3KOGUGQ
         817VaQJPnR7GsZVYGkwq+964vjui20fvVFEQk7M/FQVq60bqF73JNj9QiKODrgwUQ7zi
         yLpsUzd1YyVnkxV5eos3IO5UO4nFtRyfbrR1V6Rp65cxS+EjwZSNaaDKvuMWeSpnUGQc
         pkbyhInUm8YZLhx64co+UasMc8WWVBW3DLVROx7cy4EmHFr/+zLKQHURZspkeXh6b7pY
         16Kgw4B0bxOKIhCL3+Zbeh7/5HLgEZKUUFhbUsom92941YPtGtVmRLKrvp6bUU396tWD
         RQMA==
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=N7qzB9Qe3+OoqLfXuOgTQ/Mos6HK61X6WXjZ1mPKoUI=;
        b=aPoxsBQG31cQicMMw9R6bjuHozePR37BKMpZIQp7tNUdW0jC/B5kkYpD5YQh3E27nG
         mqX1NOY2esZkuBoWKL2RMZNtuYSthXHljmMliP/yYaVSiQ9LURrBNPzNtBUCrgneNWiR
         ap5qs6BMHMmxWsa4gBgCzZyq7os3MRiR+gvow6wBdVxtva/LYc0LJ0bnqIhf/xi/ai6e
         9oebtyvb+K+J16DDJ7+GVpiZ+eawK1rzWiEg2yh4cvThnJ1V4Z0Ys9CEHLfYGqU1nZm4
         yt+idNNRki+Yqw5UcZzZo8RkT3D1GZ7g4HAQdVxsXz0Ieb3Bug6qdujx/684NXm+WtA3
         qgCQ==
X-Gm-Message-State: AGRZ1gLeFodWSLbOCypo2thEl070MKawPQKbopORkKsjNCcj3kDvJUPu
        QwxqlPxvXeoOR/TrXg2tOygxdGBP
X-Google-Smtp-Source: 
 AJdET5eItZeUE3uY6UFaFVIndvB2wNPdjvdMC3gU4znnKJihKfpcsqqqwr8IbbbdRcgBCFqVhirVvw==
X-Received: by 2002:a19:660a:: with SMTP id
 a10-v6mr2514970lfc.100.1540621508485;
        Fri, 26 Oct 2018 23:25: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
 c81-v6sm2097487lfe.79.2018.10.26.23.25.07
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:25: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 63/78] config.txt: move sequencer.* to a separate file
Date: Sat, 27 Oct 2018 08:23:36 +0200
Message-Id: <20181027062351.30446-64-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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/config/sequencer.txt | 5 +++++
 2 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 Documentation/config/sequencer.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 1c2a6ec3c5..ab504eaba2 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -405,11 +405,7 @@ include::config/reset.txt[]
 
 include::config/sendemail.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::config/sequencer.txt[]
 
 showBranch.default::
 	The default set of branches for linkgit:git-show-branch[1].
diff --git a/Documentation/config/sequencer.txt b/Documentation/config/sequencer.txt
new file mode 100644
index 0000000000..b48d532a96
--- /dev/null
+++ b/Documentation/config/sequencer.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 27 06:23: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: 10658195
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 4EE635A4
	for ;
 Sat, 27 Oct 2018 06:25:14 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3ADA62BF74
	for ;
 Sat, 27 Oct 2018 06:25:14 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 2EB3F2BF90; Sat, 27 Oct 2018 06:25: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 CA8772BF74
	for ;
 Sat, 27 Oct 2018 06:25:13 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728275AbeJ0PFG (ORCPT
        );
        Sat, 27 Oct 2018 11:05:06 -0400
Received: from mail-lj1-f193.google.com ([209.85.208.193]:41813 "EHLO
        mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728238AbeJ0PFF (ORCPT );
        Sat, 27 Oct 2018 11:05:05 -0400
Received: by mail-lj1-f193.google.com with SMTP id u21-v6so3100948lja.8
        for ; Fri, 26 Oct 2018 23:25: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=g2YUnGPIkbWa0q009C75PtprE9UNT4Ovxf+EaXt4Yi0=;
        b=pGYf2WQnVKLcUYKSg2AM1glgugjAfheu9y0pkEg9UGcOqGWJvxZvJvSUBio0G7ngOB
         LOMo15qyWqzLBTuRzPB/OqhqVH5U/+C6MWbMkg84J+OlqEcZMLPjh51xKboHKpATPsFH
         ceLktuJ/IXzmfb6OyIERFNTK79TMqwsVaxV05l2OWe2O/qN3cH1afIV3x68xJ9VQ7liw
         aBBNQm8BXL8i8m9r14JQgVkSMwVWA+YWfdK+hCoks63HzD0ylcFIHCdVKk972uUvWEvt
         0WHMz3vgP4vkZp8kNqzGvTVbqnRvD0q4y2xz9aAkp/xnv960f9wUperajQCJKg0KpRYI
         ZOFQ==
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=g2YUnGPIkbWa0q009C75PtprE9UNT4Ovxf+EaXt4Yi0=;
        b=Y/JUZZc5+LlM31DxnKz1cvvVQc03bQNudGxkfgAvfWQflKq+5rvT0bcVWpzROJVITg
         jN+d/yoqQbSG99K32QBKopgswyzpC/AH72i6RDzSF22oxMRwmTos5giBJENx7OtNQjXE
         0CxgAjr7eo37xS2za1hcOjejpPsJtoZwy1sRcBR2+aC3jOFv3+zvVbEyUNha+o/Yl1iS
         joWzPa960/e0Br+pMFQECOZJ0nw41C8+VYwHjO413WcrQDXKHsxlOPTY6H+MAeUIt378
         HAZFTChT/8KAZaqmPRLewQmZg8BjMb0xJWe01bWk0V+30lpfcp+nP+ESmNq1yw4FRxE5
         VYMw==
X-Gm-Message-State: AGRZ1gJLzsDiJBSE/R83ukzIfbKyF4HjnjRMFvy/L+gsByrRxY4r9i2J
        7ze3+0rBsShmO9MV7XlnAovCQWBh
X-Google-Smtp-Source: 
 AJdET5eV7SXapuM0LEMTyT5cKskT+w0ZPZulciYBo9RUE6GT1EQkLv97FoTm6m9GxryVP/WKjqmlkA==
X-Received: by 2002:a2e:529d:: with SMTP id
 n29-v6mr4112169lje.54.1540621509682;
        Fri, 26 Oct 2018 23:25: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
 c81-v6sm2097487lfe.79.2018.10.26.23.25.08
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:25: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 64/78] config.txt: move showBranch.* to a separate file
Date: Sat, 27 Oct 2018 08:23:37 +0200
Message-Id: <20181027062351.30446-65-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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/config/showbranch.txt | 3 +++
 2 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 Documentation/config/showbranch.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index ab504eaba2..56cfe3e857 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -407,9 +407,7 @@ include::config/sendemail.txt[]
 
 include::config/sequencer.txt[]
 
-showBranch.default::
-	The default set of branches for linkgit:git-show-branch[1].
-	See linkgit:git-show-branch[1].
+include::config/showbranch.txt[]
 
 splitIndex.maxPercentChange::
 	When the split index feature is used, this specifies the
diff --git a/Documentation/config/showbranch.txt b/Documentation/config/showbranch.txt
new file mode 100644
index 0000000000..e79ecd9ee9
--- /dev/null
+++ b/Documentation/config/showbranch.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 27 06:23: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: 10658197
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 D3B3C13A4
	for ;
 Sat, 27 Oct 2018 06:25:15 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BFEC12BF74
	for ;
 Sat, 27 Oct 2018 06:25:15 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id B3F552BF90; Sat, 27 Oct 2018 06:25: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 4B3992BF74
	for ;
 Sat, 27 Oct 2018 06:25:15 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728527AbeJ0PFH (ORCPT
        );
        Sat, 27 Oct 2018 11:05:07 -0400
Received: from mail-lf1-f65.google.com ([209.85.167.65]:46333 "EHLO
        mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728520AbeJ0PFG (ORCPT );
        Sat, 27 Oct 2018 11:05:06 -0400
Received: by mail-lf1-f65.google.com with SMTP id o2-v6so2462248lfl.13
        for ; Fri, 26 Oct 2018 23:25: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=i2tBOORvYfqmDrlbfZNna9t/oZ2/UUWXcp1Fght9czY=;
        b=kGPRFLptRtPUw6MFDGceVNnU/yv6eDKwoIdf+A564Kh3QGANhSCCGF4xGOzy+agGC4
         TxsCB5P8qzfRX0OyG2t28Z/jJZa4NxswNPgO3BW9GhsAmoCXTtCEVHY1rnS5Pq8tG571
         87Gv1t27Q8M2PMZRJdlnM+Iedf2KW/R6ehajw9xlidBIhVLbXt9FMkAiZQx7P1W0Tdhn
         84Lk713bnbHkMyRIv+uHBWr9mZNhtGkWh3YmBhxCtUQLyHZ6P9dx+DCNlm9ob0PxdIqG
         UFqFF88ipRoJ1FXDF7eg+gRJQIS2Gt1LNfp8U0+D1fXr/7G4yfFLlWycxZ76EwDmqfWV
         yfyg==
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=i2tBOORvYfqmDrlbfZNna9t/oZ2/UUWXcp1Fght9czY=;
        b=LNCHySS4j8KbEkgeN2YxUAfFyzZ7LbUPiHUV3wMJa7+zuCVAjyMEdvQWZe2YJG6Xqe
         XcxnZbkm4H+dlMmAbqAdWYnVwVW5T2JovNGqCJKqdRPw6ppqLHUehaQKnSMduDfRo1Zm
         5Ieli1AxxlhSip6ljmxUYuRtC6ts9+96s6mXpsKS5PsrzCM1hWPZMt0VRYALoDzAjsjD
         F5j0K7GXncV1qlWzLchLZBh5JxhlUtrQs/JL39hNgVm0k7FqVIcny+qvPSFWL5PbE+Fl
         Y5AjCMaX+KVEFLu6BxjuRlqfWTOamilUY4OrV/AD21QcaJPkB1nV1XI3Qz8uAeS3UH9B
         rbiQ==
X-Gm-Message-State: AGRZ1gLfyw4r5s4c63fd+KjFvs+FVZHAtt6zYYcW0bjNThkwGuA4Pg/A
        mewOkHoZtIpPPYVJjGLiaakBCvjI
X-Google-Smtp-Source: 
 AJdET5cF8kLiTPm4bOz42oVDDcVPXIBJ6cKCKbClRi1SOjegaKeAbBaA+Gpdn6plFf+yyeft8GnH3Q==
X-Received: by 2002:a19:1d0d:: with SMTP id d13mr3749819lfd.74.1540621510692;
        Fri, 26 Oct 2018 23:25: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
 c81-v6sm2097487lfe.79.2018.10.26.23.25.09
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:25: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 65/78] config.txt: move splitIndex.* to a separate file
Date: Sat, 27 Oct 2018 08:23:38 +0200
Message-Id: <20181027062351.30446-66-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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/config/splitindex.txt | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 24 deletions(-)
 create mode 100644 Documentation/config/splitindex.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 56cfe3e857..13beb1ea18 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -409,30 +409,7 @@ include::config/sequencer.txt[]
 
 include::config/showbranch.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::config/splitindex.txt[]
 
 include::config/ssh.txt[]
 
diff --git a/Documentation/config/splitindex.txt b/Documentation/config/splitindex.txt
new file mode 100644
index 0000000000..afdb186df8
--- /dev/null
+++ b/Documentation/config/splitindex.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 27 06:23: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: 10658207
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 01AA35A4
	for ;
 Sat, 27 Oct 2018 06:25:22 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E05B42BF74
	for ;
 Sat, 27 Oct 2018 06:25:21 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id D47472BF90; Sat, 27 Oct 2018 06:25: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 306BC2BF74
	for ;
 Sat, 27 Oct 2018 06:25:21 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728529AbeJ0PFJ (ORCPT
        );
        Sat, 27 Oct 2018 11:05:09 -0400
Received: from mail-lj1-f194.google.com ([209.85.208.194]:38791 "EHLO
        mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728238AbeJ0PFJ (ORCPT );
        Sat, 27 Oct 2018 11:05:09 -0400
Received: by mail-lj1-f194.google.com with SMTP id k11-v6so3114683lja.5
        for ; Fri, 26 Oct 2018 23:25: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=HbAyPcAgJbxT8ARauRA7+kIY6eu1AinGlRWp3EFJJuM=;
        b=HfZYGXWhrKyUWmsv2mSK0XOiMTnbB1riznvaX9ykKfnqhcbIvpkWyfaNORyoNg4HL1
         A/LPoXwLZ7qzcQI82BbpHGY5jlYGmo0M6MJBKWNY0Vhkpjp1kj/PZgC1b3APnMEQr6wp
         kvicERKKIgi+gCXLxhWKxMwMJov3qfe2k0c0Ms6Qg961M34+gTCbYQZm+VvaFxmKoUS6
         BL226hYZZDBoIWVWp+O+sVbnLKNBAY+9XvuJJVmNpQoSAssMLDqW0ZTJWxV9Qc/pET6L
         EK+6jJMvsPwlDQYfVgFojnwsw8ILZcB+Ps4P5c/OTv5MfgMdRThTy3t67OHPHbaqy+dM
         OYsg==
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=HbAyPcAgJbxT8ARauRA7+kIY6eu1AinGlRWp3EFJJuM=;
        b=BnCP4io6tPoTQedZPD1otQNfjxELYWV45YZTLKYmESIN4X4t7PTi+LW1shXwKi7iZc
         1t9d6l2Lyn0x2vtYVAbpLO2Mf2EOkHBg8t6OAf5Syq4WEaYDacMe+1KRv2yDL4yspBOl
         D7sbDueVSN38S//bOnh6e5XGxF1OfcEcG/MnX1UUbjsOyUktvpTlWyvp6RyEoAkve+t5
         Bi9kP5QO5Z3XlDjieCVNRKakigCjr1SSXrp6E2HGT3M3NT377y6Psb4YCYGSLN7s4E4r
         otza5HSohtFl3AA4MweH32prOB/VE6rvaSZiqW1sJK3BwhXzoVgXNAyxXKzOKYy4cxqr
         IXoA==
X-Gm-Message-State: AGRZ1gL1RIJH7ig1s8sH7jnvPBwiRRDEk2C3r+VYid9CkHVqIPLMS2Tb
        UchL/5WmOCsI6caLDveiLA45Atp9
X-Google-Smtp-Source: 
 AJdET5e44ebEz/OtC0FspS3fsUJGFjFj3GjP+MJlmpCHGp8GzdZhxjSr4pa6m0oCSCtdiZDFLwauHg==
X-Received: by 2002:a2e:1615:: with SMTP id
 w21-v6mr4196875ljd.33.1540621512106;
        Fri, 26 Oct 2018 23:25: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
 c81-v6sm2097487lfe.79.2018.10.26.23.25.10
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:25: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 66/78] config.txt: move status.* to a separate file
Date: Sat, 27 Oct 2018 08:23:39 +0200
Message-Id: <20181027062351.30446-67-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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/config/status.txt | 72 ++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 72 deletions(-)
 create mode 100644 Documentation/config/status.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 13beb1ea18..5e9fc20c41 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -413,78 +413,7 @@ include::config/splitindex.txt[]
 
 include::config/ssh.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::config/status.txt[]
 
 stash.showPatch::
 	If this is set to true, the `git stash show` command without an
diff --git a/Documentation/config/status.txt b/Documentation/config/status.txt
new file mode 100644
index 0000000000..ed72fa7dae
--- /dev/null
+++ b/Documentation/config/status.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 27 06:23: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: 10658201
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 D7D015A4
	for ;
 Sat, 27 Oct 2018 06:25:17 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C48AE2BF74
	for ;
 Sat, 27 Oct 2018 06:25:17 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id B8D252BF90; Sat, 27 Oct 2018 06:25: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 6807C2BF74
	for ;
 Sat, 27 Oct 2018 06:25:17 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728531AbeJ0PFJ (ORCPT
        );
        Sat, 27 Oct 2018 11:05:09 -0400
Received: from mail-lj1-f195.google.com ([209.85.208.195]:45821 "EHLO
        mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728520AbeJ0PFI (ORCPT );
        Sat, 27 Oct 2018 11:05:08 -0400
Received: by mail-lj1-f195.google.com with SMTP id j4-v6so3090479ljc.12
        for ; Fri, 26 Oct 2018 23:25: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=k1DWVhdTbs7EftDOkUC6OD1jGimFf7nbLgSf+PGKnaM=;
        b=s4A/6LyGZOYKgfhWfgoPXWj5h8OI+55YpiW77PWhKk+7lbRQwCNBXx7IU41CNYDNdc
         e5V1YyUtQbxiUheOoh3jmwydyiLEpYJTdN6A+LE4tcrdU+h2gt/97b4K9rgxejJezeIJ
         w+MU0ns8uZVArlev2gB987P/VJKZMS/4VJY8WiDA0VlCRjdicAUMfWfhQqSPw0S/4g4Q
         6Cdpd/SimiCVXnTcSVaGzM6jhfMLHUyjQQ8+wOOdJgTr8v9P/z+euvpcmY3OrbSlu4JV
         wuRsR2bNQC9qbSpQAQ+SRsNM8DKcuk/OEl4HGNqNYN3eKMWkiv1h7J9eD3CeGYbJeHvn
         tB/w==
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=k1DWVhdTbs7EftDOkUC6OD1jGimFf7nbLgSf+PGKnaM=;
        b=iZXWz150QcpoNWzZdDyJ0QjjFH6iBaF8WlbDwqrGj9Eu8RQ9+krLWoz+QTDzE8/yXh
         MItQOG1Y0RabaaPaS4KpT3p/KRB8c+aWx/6rPVmA12LaLru5LbCU3LoHTwjfuzfKfMA3
         QWFhvZdlsJfAyv71LbNSU2wYFMa+9Ir70tJgCuP81bqOu8cY4bTje/taZcFqLhkQBEtv
         BCQ2hYHtUfBeXDbZM2hBFGQrYff4bCfURSKHmJgi9HeVfCvPQPsj1YfitzrlXQwvkIoa
         vWEJ2zOCTBHpJEnDfV/BHcm8MwTAE3KW4NCV6b5ay0AKHkv4gSN50jYVMmCYWI2d/3Oa
         XPaw==
X-Gm-Message-State: AGRZ1gKDGBDcpqNmKiVg35G1uk3AU2D4nnEFMwp09Odyx2b/6fvAaJj7
        i1MmCQymteh6iuGezUn4zS2pd+lF
X-Google-Smtp-Source: 
 AJdET5f+gldsRIq+d8h+q/bMmCBjsMeujdcgl03ttoX2LeCOOukpUnCfa7smX4SK0nFEe2sppQic9w==
X-Received: by 2002:a2e:1241:: with SMTP id
 t62-v6mr4020669lje.81.1540621513133;
        Fri, 26 Oct 2018 23:25: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
 c81-v6sm2097487lfe.79.2018.10.26.23.25.12
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:25: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 67/78] config.txt: move stash.* to a separate file
Date: Sat, 27 Oct 2018 08:23:40 +0200
Message-Id: <20181027062351.30446-68-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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/config/stash.txt |  9 +++++++++
 2 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100644 Documentation/config/stash.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 5e9fc20c41..aedc73f4eb 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -415,15 +415,7 @@ include::config/ssh.txt[]
 
 include::config/status.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::config/stash.txt[]
 
 include::submodule-config.txt[]
 
diff --git a/Documentation/config/stash.txt b/Documentation/config/stash.txt
new file mode 100644
index 0000000000..c583d46d6b
--- /dev/null
+++ b/Documentation/config/stash.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].

From patchwork Sat Oct 27 06:23: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: 10658203
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 77D3B13A4
	for ;
 Sat, 27 Oct 2018 06:25:18 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6393A2BF74
	for ;
 Sat, 27 Oct 2018 06:25:18 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 57ED62BF90; Sat, 27 Oct 2018 06:25: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 086072BF74
	for ;
 Sat, 27 Oct 2018 06:25:18 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728534AbeJ0PFK (ORCPT
        );
        Sat, 27 Oct 2018 11:05:10 -0400
Received: from mail-lf1-f66.google.com ([209.85.167.66]:45266 "EHLO
        mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727772AbeJ0PFK (ORCPT );
        Sat, 27 Oct 2018 11:05:10 -0400
Received: by mail-lf1-f66.google.com with SMTP id c24-v6so2470577lfi.12
        for ; Fri, 26 Oct 2018 23:25: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=ikwnYpmqg6wGRvpDTILCxxT5F28ii2BQ+np5ZeUQIuc=;
        b=HUguo97hBhllBTK5Qi/ppmTtW5NJ/aDxHD6FE+F7k2mNhJM4iMbXSIDUj68WQREDN7
         1Amc94oecXOsdDK6teNQKHjQxeTimrfcKhfnNhrx9iIfOknxTmyfcHS07xN3H8ZpXC7U
         iLKB+zDmkxmsTBQ4UVsN9N0GiZiWPnTX39OMjjIebE2WOuIL/+hsZbqcS8yKDPiMM/a3
         x3OnvBK/O5SC28CdTAmvvIz6atjfJl54sUmOvrFrPkXnlk3qvKqCi6UIO16JI7kx3vDU
         4mKxZJ551oVXt/vWfVZJ/mZwR50ugXW2dQ7GwN0kDIadGH+0x1ntzHtBAP/H9gxu/L2z
         Mj2A==
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=ikwnYpmqg6wGRvpDTILCxxT5F28ii2BQ+np5ZeUQIuc=;
        b=e2pYJ24xYdPQejRfdHUpK1U9WktOn4pZe1PEo526Gqsc8A9fyBxjDZVL7RQhnGAbkK
         QmQ9aLrSBCLbChH4DYe57pwG90sPbYaHBtXhQlLQfW4NAESEtQFFHhWjDAdChiSIgflL
         oQD/ujG9tPF6aNwi12JsNBg6Nb2YhdNeMhv9SzwhhtF/qQ5T50wmc46Ht8aONkLxR7ve
         MqiRjVw/JdMjZn94UZ9aqahBS5fdvYfWEoV3peB6uIhx8WHE3zrES5cL7w1KKYUck2fD
         hOqFAkHvAWMczEpPid9JVzHHwyYTNY0nHFsq0R7WmHPPrkkIV87vSPU3WrygiEe1dMje
         SM1Q==
X-Gm-Message-State: AGRZ1gLUtaMTiwEkHRIaZ3i7Sa1wZZ3hYRogXyStlfMQMG87VdDQQw6u
        bEhSu3Ec+g+LqELZWLQe0xGip3n9
X-Google-Smtp-Source: 
 AJdET5cZmWIqjty6uNC2BaA6THA7J9mkAMqJ1HnTjRbPdJf/Afi5cdlDay5GEMFT/jRcJgzrkZlUbA==
X-Received: by 2002:a19:4287:: with SMTP id
 p129mr2884318lfa.135.1540621514391;
        Fri, 26 Oct 2018 23:25: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
 c81-v6sm2097487lfe.79.2018.10.26.23.25.13
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:25: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 68/78] config.txt: move submodule.* to a separate file
Date: Sat, 27 Oct 2018 08:23:41 +0200
Message-Id: <20181027062351.30446-69-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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                                     | 2 +-
 Documentation/{submodule-config.txt => config/submodule.txt} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename Documentation/{submodule-config.txt => config/submodule.txt} (100%)

diff --git a/Documentation/config.txt b/Documentation/config.txt
index aedc73f4eb..966e82e851 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -417,7 +417,7 @@ include::config/status.txt[]
 
 include::config/stash.txt[]
 
-include::submodule-config.txt[]
+include::config/submodule.txt[]
 
 tag.forceSignAnnotated::
 	A boolean to specify whether annotated tags created should be GPG signed.
diff --git a/Documentation/submodule-config.txt b/Documentation/config/submodule.txt
similarity index 100%
rename from Documentation/submodule-config.txt
rename to Documentation/config/submodule.txt

From patchwork Sat Oct 27 06:23: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: 10658205
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 0F8C15A4
	for ;
 Sat, 27 Oct 2018 06:25:20 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF42A2BF7B
	for ;
 Sat, 27 Oct 2018 06:25:19 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id E2BEB2BF74; Sat, 27 Oct 2018 06:25: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 825FE2BF74
	for ;
 Sat, 27 Oct 2018 06:25:19 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728537AbeJ0PFM (ORCPT
        );
        Sat, 27 Oct 2018 11:05:12 -0400
Received: from mail-lj1-f196.google.com ([209.85.208.196]:36275 "EHLO
        mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728520AbeJ0PFL (ORCPT );
        Sat, 27 Oct 2018 11:05:11 -0400
Received: by mail-lj1-f196.google.com with SMTP id s15-v6so3127591lji.3
        for ; Fri, 26 Oct 2018 23:25: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=pgm15OlkK8kRZWm7HJi+2AJyelwdVvOmyLVPjmav5N0=;
        b=QysHbeI1B9hhAa6pP02p+r+hJpGdrvl6y9CggLaQvaqvLlfq9ZY5JYqqXzlyEY9q8f
         7pYg1z1qAE/+A82e97x8v3xzAwyvrB50YYm2rIvu2AtSd3rdpm/HljRtDjl9cYsWg/Fu
         2mOBqeJ6m4zQcJC+OjY4H7in9B96VlGLB8gyOZfxNVx5+E3XT7V1tKAYAdM+q3bIOgdI
         7Zz3ho2dxeGTtKUhOW5f6dGgvQJivAp7OcIeMfS+SaDg4bsFuiwQBE2YZiplKA35EyoZ
         6IfwlLOph1dnnOfRmeMIfpH8/8FRKjvcECi7SgppcxVnclECmrmNVo8OlBIGYZ82zDzY
         HvzQ==
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=pgm15OlkK8kRZWm7HJi+2AJyelwdVvOmyLVPjmav5N0=;
        b=q1afM2SjOqaDaHVyim86eZJIND4qc+H1YjMUGh0yz4l0aUb7Y48O/KRVWTQRLBa31N
         6Wh1mSPr/z7haX5wW0nXDIMpcE0aD9shjqLbu4AIBVrQJ7WlAicsV1J8W6XhopeJxI0M
         o3ddTjOuS8J32DcwXfT+QCbjwnoaijvJg0hPWEvENGpk7EJwcjk4mPt8A1+ctigkGyBr
         GTPzdFwLGMPoGjgu6QRr0AbvqMSHalvQPRxb/FTCSn1m7xQttVsdO6KOctphBu6Yx8qT
         xY/Tvyo+JwZ22z1VbcOZif/Tp5ASMkCWpsnqQfR55n8Pvg8vkCmmCXCzSvVMMqBEUc3H
         ktvw==
X-Gm-Message-State: AGRZ1gLUJc67B2zJwve3AKf19ag4PfLF+z3b+bu2j2mtAM7h1il0HzTS
        T0BKzb7WF+USqdbBwD6haw5AFozg
X-Google-Smtp-Source: 
 AJdET5d16YMqfVn9oMFTEpimwSYOXTY8uQ08wzkZpGaNw6U55l+xYpaOiFsUPWh+g1APm1MF7Ezosw==
X-Received: by 2002:a2e:5159:: with SMTP id
 b25-v6mr4596977lje.156.1540621515762;
        Fri, 26 Oct 2018 23:25: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
 c81-v6sm2097487lfe.79.2018.10.26.23.25.14
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:25: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 69/78] config.txt: move tag.* to a separate file
Date: Sat, 27 Oct 2018 08:23:42 +0200
Message-Id: <20181027062351.30446-70-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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/config/tag.txt | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 16 deletions(-)
 create mode 100644 Documentation/config/tag.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 966e82e851..1db9c58e8d 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -419,22 +419,7 @@ include::config/stash.txt[]
 
 include::config/submodule.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::config/tag.txt[]
 
 transfer.fsckObjects::
 	When `fetch.fsckObjects` or `receive.fsckObjects` are
diff --git a/Documentation/config/tag.txt b/Documentation/config/tag.txt
new file mode 100644
index 0000000000..663663bdec
--- /dev/null
+++ b/Documentation/config/tag.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 27 06:23: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: 10658209
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 C741D13A4
	for ;
 Sat, 27 Oct 2018 06:25:22 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B085E2BF74
	for ;
 Sat, 27 Oct 2018 06:25:22 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id A4D752BF7B; Sat, 27 Oct 2018 06:25:22 +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 E78F52BF91
	for ;
 Sat, 27 Oct 2018 06:25:21 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728542AbeJ0PFO (ORCPT
        );
        Sat, 27 Oct 2018 11:05:14 -0400
Received: from mail-lj1-f196.google.com ([209.85.208.196]:47068 "EHLO
        mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727772AbeJ0PFM (ORCPT );
        Sat, 27 Oct 2018 11:05:12 -0400
Received: by mail-lj1-f196.google.com with SMTP id x3-v6so3089788lji.13
        for ; Fri, 26 Oct 2018 23:25: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=WFKMWA5mZt0wpeWHIU10sq8oBMrLWaqJnkJsbnGzeAc=;
        b=ZE/Fvce82mORrg5Mcj0vgJt+duuQ3xFbJzPS3HvozRWQiOH/f8k0YIVX14AtHptjp0
         LbkuFycDTOMWncpWPnFhKrPTovGq1qW9zxpojBUX6raySzR03wfX0Pr3OErhS6nMgGar
         btvN+8Qj0wuZg5M0ZjPsfKzECy0/N3eCAzYQnRr9VhAzvqpRgMLOCIw7RXpyVY++7e5I
         g2AQU7kNuV9GdVVX855uJT6I1WeECK3tp4rIToU1FqkUKu3G16eoLWlK3N6lqAcLXXB4
         ZupZV1fKR9Y6yO38KReNHoPgmT4X+duB4za8anXSMp+XmqpMSHyS/gKYiQ0N2GNIzlLU
         CXVQ==
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=WFKMWA5mZt0wpeWHIU10sq8oBMrLWaqJnkJsbnGzeAc=;
        b=GDRTgNVjBnFB57+PCZVZ5R4lVx6KD4Ob0E6mjOKeiTaP7Vz83Bikh6JiOe79hTkHmM
         SBhENt3E7oA1cUdYdlFc7IIAFDTU8szGFeg+ARy/wwLIe3hSmG15XlBDBa/E0tgj2g5Z
         IVDVMj5GJj1jLFT2JKCrEP8rgzERhc2ca1An7S7TPO4ltZ4/C/oSj4VVPvyxeuawsJ0E
         60tRcYXCf4cTLbKZ5xnQuN7YcpA2w16xm/0RPCGf+NVkK+funtBGqYRfhavY9xl2cTyF
         5tHxqWRcAE8I0lkOQDs+VpiAPah/TVS2bTkgjmuJwTqNGHGy7fp4JPuOQimAsPdaBRM6
         Bggw==
X-Gm-Message-State: AGRZ1gKSPuDdRCaG03RSgKU39tXKxzBE+PwsV43z6/ZIYoIymrXqnySs
        8/1ksu1bd64hKr+k4tSAUh5DkzU6
X-Google-Smtp-Source: 
 AJdET5cjdc+y2yTlDAoCry+NsdqyNiNjLdAznhiQXLMu2pmixol0zw1Mf2SB/nZjKMyUE0hQxgDegA==
X-Received: by 2002:a2e:7f14:: with SMTP id
 a20-v6mr4088418ljd.148.1540621516678;
        Fri, 26 Oct 2018 23:25: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
 c81-v6sm2097487lfe.79.2018.10.26.23.25.15
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:25:16 -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 70/78] config.txt: move transfer.* to a separate file
Date: Sat, 27 Oct 2018 08:23:43 +0200
Message-Id: <20181027062351.30446-71-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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/config/transfer.txt | 71 ++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 71 deletions(-)
 create mode 100644 Documentation/config/transfer.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 1db9c58e8d..07100e236e 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -421,77 +421,7 @@ include::config/submodule.txt[]
 
 include::config/tag.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::config/transfer.txt[]
 
 uploadarchive.allowUnreachable::
 	If true, allow clients to use `git archive --remote` to request
diff --git a/Documentation/config/transfer.txt b/Documentation/config/transfer.txt
new file mode 100644
index 0000000000..4a5dfe2fc1
--- /dev/null
+++ b/Documentation/config/transfer.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 27 06:23: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: 10658215
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 DD2BC5A4
	for ;
 Sat, 27 Oct 2018 06:25:26 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9A6C2BF74
	for ;
 Sat, 27 Oct 2018 06:25:26 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id BE1812BF90; Sat, 27 Oct 2018 06:25: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 6CA212BF74
	for ;
 Sat, 27 Oct 2018 06:25:26 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728540AbeJ0PFO (ORCPT
        );
        Sat, 27 Oct 2018 11:05:14 -0400
Received: from mail-lf1-f66.google.com ([209.85.167.66]:40933 "EHLO
        mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728520AbeJ0PFN (ORCPT );
        Sat, 27 Oct 2018 11:05:13 -0400
Received: by mail-lf1-f66.google.com with SMTP id n3-v6so2486691lfe.7
        for ; Fri, 26 Oct 2018 23:25:18 -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=qwzOdrG0GfS0h3AseVgtqC/13d4oub4gertiKperm/o=;
        b=UdA/8ehI3hFBb1nXMMvgu96qGEwtJ2H+PjWtRMElKDmw2aIHnknkdTSVTHCGM8aT9K
         71ZRUO7upUccJ9YZ8HUPIJMPvE7FNSzjrle1npX14hXAjnSnCToJbs0dJIJX6Aeb152h
         iEDMCYJw2kp8s/L4nAKxu5sc0xkiiwRNxaOJMm4JtP4i0fhacYD4v1RAnBwscuaNpu9+
         WD7dMgmqI5pM6T9vIATWLrCZko8hjmOAF4FGZcymm5Pv3D4devSUBdinSkZZnSTaJD/M
         IPuPRixbLFd0fhQseqOyABmQl5iNM9oWGNQAM8D2495ZbImMqsP52LJ1rGuXvWQNfRvS
         2MPA==
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=qwzOdrG0GfS0h3AseVgtqC/13d4oub4gertiKperm/o=;
        b=trkhZQWZUIOOsf3wBl5yNcIRf83erGmWG2lQi1rPDlVEbKcHZXtPmvSP9Jjeax/qoX
         xb36lrDNTpM5RlltOOydz+V0zKHZBt69KEE3SQYsGib7ca2+86IopW+fcaKB/FO/u57x
         +Hx0VkM050EbPw3xPpr+p0TzEQSuGkU3svn4eFn1PbJs+GYt0qustj19yI+tLC84Qq9k
         OWCTmAwXA2wvWHfFlnWuyTXxDh0QLh9+UWhKtTkMJXNm8H3cZ+ZArYtieYMLGNsnwhwi
         XwqAZJDOn38DYp6wRaSglc1+gS3ckeJBxqriGM3GX9MfDo2YwXphcyFVwOCj0uVIdpYT
         9HJA==
X-Gm-Message-State: AGRZ1gI3WJPQfEikN/TrKfNe7I8HpuaKGrV6AuZG3rcL+ceMmz6g7o4z
        AIRMk3qRc4UMNRnNNqXfj4GdpqvP
X-Google-Smtp-Source: 
 AJdET5cT2cAvmTAbWRESIW81dn8VCCie6jOQrffpuB7A0FNys7Olq8nhSs6jm/4qaaEMKMLegLvf9A==
X-Received: by 2002:a19:25c2:: with SMTP id
 l185-v6mr2795916lfl.122.1540621517615;
        Fri, 26 Oct 2018 23:25:17 -0700 (PDT)
Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se.
 [80.216.12.205])
        by smtp.gmail.com with ESMTPSA id
 c81-v6sm2097487lfe.79.2018.10.26.23.25.16
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:25:16 -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 71/78] config.txt: move uploadarchive.* to a separate file
Date: Sat, 27 Oct 2018 08:23:44 +0200
Message-Id: <20181027062351.30446-72-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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/config/uploadarchive.txt | 6 ++++++
 2 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 Documentation/config/uploadarchive.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 07100e236e..00cc2791b5 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -423,12 +423,7 @@ include::config/tag.txt[]
 
 include::config/transfer.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::config/uploadarchive.txt[]
 
 uploadpack.hideRefs::
 	This variable is the same as `transfer.hideRefs`, but applies
diff --git a/Documentation/config/uploadarchive.txt b/Documentation/config/uploadarchive.txt
new file mode 100644
index 0000000000..e0698e8c1d
--- /dev/null
+++ b/Documentation/config/uploadarchive.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 27 06:23: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: 10658211
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 4CEAC13A4
	for ;
 Sat, 27 Oct 2018 06:25:24 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 37A952BF74
	for ;
 Sat, 27 Oct 2018 06:25:24 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 2BC402BF90; Sat, 27 Oct 2018 06:25:24 +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 7664C2BF74
	for ;
 Sat, 27 Oct 2018 06:25:23 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728545AbeJ0PFP (ORCPT
        );
        Sat, 27 Oct 2018 11:05:15 -0400
Received: from mail-lj1-f195.google.com ([209.85.208.195]:39240 "EHLO
        mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728214AbeJ0PFP (ORCPT );
        Sat, 27 Oct 2018 11:05:15 -0400
Received: by mail-lj1-f195.google.com with SMTP id a28-v6so83158ljd.6
        for ; Fri, 26 Oct 2018 23:25: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=0kPXhBMtV4wpt/F5q2FXzewzVtypLCRSUOO+QlK9yRA=;
        b=NnABP61bf/xwDZHCiB9U5y5AqNn0P9w6Lj7S2n2xHCN04zcJioUjO/pZ0fOMM4ztIU
         4XgFqVoKyr/Sp21dTVZ5bsYw/g3fjniCil/F0s8mJtRlEav86uKvOAnqZjNwZGQTpAcb
         yGS1CX8F3jybmDs+X3FqQuZZYoHQkgjAGgR7tHgTw1hVPMb0wZFHy4qO67EPGIzJc5Mh
         2aqQMFtIG3TbChsjF9W2/WZg+2sdJOVmXRTa1m+hzf90SWtIrHmDu0vfGYYqUHmZbFJo
         e+ms3iVsffeeuZqGRJGg8ybjIw8f4uGoCp1eFxd/W2qrCGo3RCJ1YVe/g8YXpnVbcM44
         +awA==
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=0kPXhBMtV4wpt/F5q2FXzewzVtypLCRSUOO+QlK9yRA=;
        b=aA+ZcVeMXWUcJX2h5se5KxuDF5gNf13B/XR6L2VMvLsJPmTSPMGVcElMs7ZKQaOHXH
         KVrRAV+lOxbBbZP95q4zLklBPfe616teYEaENxZoHNFMov8cb93auenPw0iA8ZUmwtJe
         g99AoJdWTaITZoFCe8ZD5lU4g+PltAt6L8cfXmKpPMPgyTmSj0G6IDd5ZvWx6oZ+7waJ
         wfyJBTOpEClYkkhMWEyXrk2oFYoVEmXNt2Pblqm9t19bkcWgs6IDMDjQIWvfwYJn3Kzi
         25gIzfjCByy7Pl6oj/X9hlcZJmoA64sWfe3Odd4OxM/T2oDB7UL7IwGsSPUd/Ay0LtKw
         tRNA==
X-Gm-Message-State: AGRZ1gJU5qAhKLa1VBh9udPsqj8Q+2RwgcdNAjydhgEcxK4EKBA7UUv3
        HW0v694vKXPIlPL3aJCfjMDC5oyy
X-Google-Smtp-Source: 
 AJdET5c7b9gDBhSK4l8M1Mx5MEfZ71Q4UJkXztNEGSeF0PPHrqs9XDMSDH7k+5U2XA+s3+kwaK3PEg==
X-Received: by 2002:a2e:7d10:: with SMTP id
 y16-v6mr4035093ljc.37.1540621518805;
        Fri, 26 Oct 2018 23:25: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
 c81-v6sm2097487lfe.79.2018.10.26.23.25.17
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:25: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 72/78] config.txt: move uploadpack.* to a separate file
Date: Sat, 27 Oct 2018 08:23:45 +0200
Message-Id: <20181027062351.30446-73-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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/config/uploadpack.txt | 65 ++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 65 deletions(-)
 create mode 100644 Documentation/config/uploadpack.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 00cc2791b5..451c9fe2b3 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -425,71 +425,7 @@ include::config/transfer.txt[]
 
 include::config/uploadarchive.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::config/uploadpack.txt[]
 
 url..insteadOf::
 	Any URL that starts with this value will be rewritten to
diff --git a/Documentation/config/uploadpack.txt b/Documentation/config/uploadpack.txt
new file mode 100644
index 0000000000..ed1c835695
--- /dev/null
+++ b/Documentation/config/uploadpack.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 27 06:23: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: 10658213
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 8D23313A4
	for ;
 Sat, 27 Oct 2018 06:25:25 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 795BA2BF74
	for ;
 Sat, 27 Oct 2018 06:25:25 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 6D7072BF90; Sat, 27 Oct 2018 06:25: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 E2DA22BF74
	for ;
 Sat, 27 Oct 2018 06:25:24 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728225AbeJ0PFR (ORCPT
        );
        Sat, 27 Oct 2018 11:05:17 -0400
Received: from mail-lj1-f193.google.com ([209.85.208.193]:40440 "EHLO
        mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727772AbeJ0PFQ (ORCPT );
        Sat, 27 Oct 2018 11:05:16 -0400
Received: by mail-lj1-f193.google.com with SMTP id t22-v6so3107995lji.7
        for ; Fri, 26 Oct 2018 23:25: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=7SchX1vUedUUvPVnL3ZmXnHVS5w3k+OMkkYe36cU148=;
        b=mOZstiXDwA1R+We34uc5gc/Hn83FTZWrxriSBtP13X+AyLXsKMTFwruiw9x72kpgoP
         TaF/XBNlO+KKlFLsvZzX25H9XvcGgIAaldikd54H1pPasXaMmxD9cqJMPNh/hX2I6b5Z
         Bqxjw6Qis5sBYxS4BJbHtdrP/X08LmImRUk+gJSum06sQkTd80SdpUGCMZDN9NDricrW
         zP1XVyg78t8casYGviJczsLwJsaSkOgH9XhKusvBD/8xau+a1GAGED0YS4XntnZ67LfQ
         5OXqMg+Pp9lYm7ab2c6758lXsJv7B7e8r+4YOX6VWKxNakgbsttlilmCu3qSodxMP9Le
         dnrA==
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=7SchX1vUedUUvPVnL3ZmXnHVS5w3k+OMkkYe36cU148=;
        b=Am4VP5FHKltQ60dmuhMqzNe1Hd8MP5YUyuvorErWu9Ii7HHMtpsxZ+t3ZRCEo02qVw
         SxJraaRUcArhxwAaLNshx3bCXrTsKw6vOp3XiuBfTSYW2QVvIgYFtdJMncC+q1lNZJ3o
         +Ev2fzLT9Km/RTPp71ee3Ji6TQ3BwG9N0Q5VvHAJodCmCpmGn1pvm7o4g5VVKJyPBypp
         s6K0UQG9/mMQLHv2CFyfYV9GGZnM5noBNqI7MX55ZAr2CovyTUaqKfVPEooscE9BWySi
         iKICrFfndpCXKf1qFJNnlElEy1oqFD4Vbb+p9fUjuqoYWTp0J0XBA2tclcMTwvUja+uQ
         gNeQ==
X-Gm-Message-State: AGRZ1gJVXBD0Lk7WXTnV8yngCxcGk4jMFwhERc2EEx1X5t5LAwUFirkN
        ITRmPIeHxwnD6wlwHyZA6E/jVXXE
X-Google-Smtp-Source: 
 AJdET5dxdP/YVqsu5Mb9KHmje++HsWVtFIWDClnZXtaLuAFpmC8NFCZWBd2YPPBlT1SirY1ZspIsig==
X-Received: by 2002:a2e:5b1d:: with SMTP id
 p29-v6mr4158322ljb.176.1540621520140;
        Fri, 26 Oct 2018 23:25: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
 c81-v6sm2097487lfe.79.2018.10.26.23.25.18
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:25: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 73/78] config.txt: move url.* to a separate file
Date: Sat, 27 Oct 2018 08:23:46 +0200
Message-Id: <20181027062351.30446-74-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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/config/url.txt | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 30 deletions(-)
 create mode 100644 Documentation/config/url.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 451c9fe2b3..924776f7fa 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -427,36 +427,7 @@ include::config/uploadarchive.txt[]
 
 include::config/uploadpack.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::config/url.txt[]
 
 user.email::
 	Your email address to be recorded in any newly created commits.
diff --git a/Documentation/config/url.txt b/Documentation/config/url.txt
new file mode 100644
index 0000000000..e5566c371d
--- /dev/null
+++ b/Documentation/config/url.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 27 06:23: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: 10658219
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 0129E14E2
	for ;
 Sat, 27 Oct 2018 06:25:29 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E0E802BF74
	for ;
 Sat, 27 Oct 2018 06:25:28 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id D55DB2BF90; Sat, 27 Oct 2018 06:25: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 BFBDD2BF7B
	for ;
 Sat, 27 Oct 2018 06:25:27 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728548AbeJ0PFU (ORCPT
        );
        Sat, 27 Oct 2018 11:05:20 -0400
Received: from mail-lj1-f196.google.com ([209.85.208.196]:33364 "EHLO
        mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728546AbeJ0PFR (ORCPT );
        Sat, 27 Oct 2018 11:05:17 -0400
Received: by mail-lj1-f196.google.com with SMTP id z21-v6so3127271ljz.0
        for ; Fri, 26 Oct 2018 23:25:22 -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=Ku5INiq7mpouNdsuvGeqmn1fip7RX8D3UYR870IQ8z4=;
        b=Uhl+uDt1rTRelmMTdmcYuRhRICn0+RplnJQNnxGOXlFIftEF0/ZV6toj3vVtHkpkbS
         SbepQ6YxqfDNqGwk5nSMeW34M4zv+2qseH4aWHbclIQAgv8/XHrGOs3AkoWHqnL8hor0
         48Pmx16KdMgefC+KAyzxX6TNMzPd3g/QQZ47IE+NOPm1YwSe+OFZNAabnX2HDkMi/yaq
         xFOuA85VAeJMWqJaIG2zz+AEz0DEUeWCrHyq++H4CBOXP4PlkeZjR4f1SQBWTJ/j+9gF
         6UGjpNdYvFHKVG8TEhRAXp4M2YW/DlYZyD74Ssbc0WxLMJcMOzreQAZWhwkCbM4KE9vF
         Iuig==
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=Ku5INiq7mpouNdsuvGeqmn1fip7RX8D3UYR870IQ8z4=;
        b=skPrmdFiaqBdQ5q/nwP8KDLYBOJub1/9eosKa0qe5tprRapiEsXu/q044yTCqTE20+
         pqc9EBXq+AydzQzbEu4aSD0joE9ePh8djul/fNHdL3EWoV5kCHrUzNPIGHATqVm2Y6ek
         pqrQEzpqJGs1qQD8S4N1+oJL2dN8TzUG3/eUxxNM3TvGQ4n+3dLTcziruf89EyzjZyrR
         HdHKBxHL+2fytEJHVy4iPhNbZYuGMyAGfXoh0niKb5jd1Fwt45dYZ7vIBS66267YISYY
         ahVIwE4Le1cz8V5YqJucfvjQWm0ixsptDKv7OznJyiBWHNsn6wh3CFe/hUNLS3PskQmt
         QSmg==
X-Gm-Message-State: AGRZ1gLSjNEha83iE2MNNha4ys2VmqCqvBmAr6RACg2Ca0ahgMyXanWY
        3aNUDYJ7KjzABTpj8nY2WGyo0fEc
X-Google-Smtp-Source: 
 AJdET5dES0ejVkQ6zHcsIMTmA8H+MjONGqAzAvl2gFcf+342KHrH7rIt4vH/3TTcQLIDKU1R2zz7fw==
X-Received: by 2002:a2e:3e0b:: with SMTP id
 l11-v6mr4588116lja.16.1540621521254;
        Fri, 26 Oct 2018 23:25:21 -0700 (PDT)
Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se.
 [80.216.12.205])
        by smtp.gmail.com with ESMTPSA id
 c81-v6sm2097487lfe.79.2018.10.26.23.25.20
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:25:20 -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 74/78] config.txt: move user.* to a separate file
Date: Sat, 27 Oct 2018 08:23:47 +0200
Message-Id: <20181027062351.30446-75-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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/config/user.txt | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 26 deletions(-)
 create mode 100644 Documentation/config/user.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 924776f7fa..3cba2420e0 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -429,32 +429,7 @@ include::config/uploadpack.txt[]
 
 include::config/url.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::config/user.txt[]
 
 versionsort.prereleaseSuffix (deprecated)::
 	Deprecated alias for `versionsort.suffix`.  Ignored if
diff --git a/Documentation/config/user.txt b/Documentation/config/user.txt
new file mode 100644
index 0000000000..b5b2ba1199
--- /dev/null
+++ b/Documentation/config/user.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 27 06:23: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: 10658217
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 6511013A4
	for ;
 Sat, 27 Oct 2018 06:25:28 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 505242BF74
	for ;
 Sat, 27 Oct 2018 06:25:28 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 446A62BF91; Sat, 27 Oct 2018 06:25: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 3028B2BF74
	for ;
 Sat, 27 Oct 2018 06:25:27 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728249AbeJ0PFT (ORCPT
        );
        Sat, 27 Oct 2018 11:05:19 -0400
Received: from mail-lj1-f193.google.com ([209.85.208.193]:41828 "EHLO
        mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1726672AbeJ0PFS (ORCPT );
        Sat, 27 Oct 2018 11:05:18 -0400
Received: by mail-lj1-f193.google.com with SMTP id u21-v6so3101222lja.8
        for ; Fri, 26 Oct 2018 23:25: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=iJIGE0NclobRyCoCCAcqkR4dY31gVCvsjY2C8h21YVA=;
        b=VOrqr8JZvNE2wC3jU7eZAGd8+Z7C9vGbiVHNjpCIutyy2VWY2Pz4hHwJ3q/8DPyCLC
         9UKN4JzNtP7KAfz4ZtgKpJrgFWndbGhzETM6poLuDEhXnPEs3ivJzH1ATOqISPc/v3LM
         JLc8EeZ20uUBmI/Yfd450DUy60kjCfNdLdR3db+ge8+cdrZTe/aePs7A0Pac9Ve0emnz
         sEzCA0yfshryVuF6B08UMtoQuDUZoZ9ZR+qU+RyaZ5Ttdl7s/zCXaCKD5wSn//Ec3wdW
         KRZmkfA7/7cEPEt8GAPrYwtgsOrE+bDF82sP4wtfT80qn84iBnTysTQZFIZ8ucUONXxv
         IR/A==
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=iJIGE0NclobRyCoCCAcqkR4dY31gVCvsjY2C8h21YVA=;
        b=R7ywcJFgvnFHWAzmn4gegxFICH2X9XRhlzT6YPBFDwR74CBWn21PJyGjUznQ6uAhTu
         8DPt8JKBfrrIfebkyxY4/ON7lozzj0KF0M74CPHvdnGEnfZa7WYDWB4SWFPVc8CK99t+
         F2bjk0eEzUlvYaZ2/Nhh9tA+JjgEeJ4N5oRwSjqLdMgmJk8mwVQx2cOOSC4JxuMQRljs
         COGxZxybm+Nsr9rnGSwPWkavg76jpf3iHY7CSBZg9QwasjDUEDcNpYSON1K5gIc78jE7
         MB+U18yJDCn7XWsJb9KISaW5Ur+3RlK4Wn6RwFOrLwc9N7tbQpzCGBMjUsGCIz6eqUXn
         na3Q==
X-Gm-Message-State: AGRZ1gKNd4VDQVj8fuc9f3T8AEF+X+aACNP4gfDz7mvYRR43WD/3rZ5t
        pXpWD1rV9EfLPlorly3+4h24vdpc
X-Google-Smtp-Source: 
 AJdET5cZ8h4fOYt4lMveBkBXqQ/TpIQRh5QUoZeMoLi0ilQr5T9LYS+rSAyH58LVKScPqJ9fZRnZPw==
X-Received: by 2002:a2e:8511:: with SMTP id
 j17-v6mr4253508lji.55.1540621522191;
        Fri, 26 Oct 2018 23:25: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
 c81-v6sm2097487lfe.79.2018.10.26.23.25.21
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:25: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 75/78] config.txt: move versionsort.* to a separate file
Date: Sat, 27 Oct 2018 08:23:48 +0200
Message-Id: <20181027062351.30446-76-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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/config/versionsort.txt | 33 +++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 33 deletions(-)
 create mode 100644 Documentation/config/versionsort.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 3cba2420e0..eacaaa2deb 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -431,39 +431,7 @@ include::config/url.txt[]
 
 include::config/user.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::config/versionsort.txt[]
 
 web.browser::
 	Specify a web browser that may be used by some commands.
diff --git a/Documentation/config/versionsort.txt b/Documentation/config/versionsort.txt
new file mode 100644
index 0000000000..6c7cc054fa
--- /dev/null
+++ b/Documentation/config/versionsort.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 27 06:23:49 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Patchwork-Submitter: Duy Nguyen 
X-Patchwork-Id: 10658221
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 D0F8B5A4
	for ;
 Sat, 27 Oct 2018 06:25:29 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BDB602BF74
	for ;
 Sat, 27 Oct 2018 06:25:29 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id B20882BF90; Sat, 27 Oct 2018 06:25: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 4A51C2BF74
	for ;
 Sat, 27 Oct 2018 06:25:29 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728306AbeJ0PFU (ORCPT
        );
        Sat, 27 Oct 2018 11:05:20 -0400
Received: from mail-lj1-f193.google.com ([209.85.208.193]:37320 "EHLO
        mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727772AbeJ0PFS (ORCPT );
        Sat, 27 Oct 2018 11:05:18 -0400
Received: by mail-lj1-f193.google.com with SMTP id c4-v6so3112639lja.4
        for ; Fri, 26 Oct 2018 23:25: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=0e2lZHeK9iEmiu7N+qqQksewfHAyMzEEbeT4sZFtoTQ=;
        b=f6DW5K5rV4voULwVwTWOCrbEjZcY4DwksC5dGHWHe1AnPG7SGvlfBMSU+KNsnGmT8r
         17Xgy+5cO+XkBYWvQkjlSuhYciQZ4e2UfD4a6HkP6Q1Up1DlrNVt2DquMH6gnFrRAhNb
         lNSKZa8B2oUf1p61wh7HxEZxcDlGPtl+SBc2xJQhqrdIffSBiAMueINngK5YdtxZHE5i
         uQ0id5uyK59Lb5AWRJbd8rUTdpc/jRGD3Hxb9F+GB1DiXMaTYyVtz+MQD3YmQWKCaA5P
         BmZUfL9ufppKWjKyh8KI2O7aUx7FLQtYldKxGJlf3LFKf1QF9HTzwll7VNhNQm3NpbfH
         /dww==
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=0e2lZHeK9iEmiu7N+qqQksewfHAyMzEEbeT4sZFtoTQ=;
        b=OR0/JXNhA5uO/vfbuBRiFgMNgljW625AMARmYEjw9aIhhGkUVzAj0ic6qmkoz51s47
         V08ObsS/OSi/Sa42TCU5g+BQl+b9zWpFNw6nBLee7Xt+qwwMmlvZC/5QrZyhFceuWNpN
         O6XZQP4zhe00xUjm7OGf5eO4IyuFBW5n/Zz69RuD7FZG5Yp2OzcQQOcEu6cCQQ3w0KTJ
         Hz5Wiyi5yoHRJwFnUR6miA9zzpR76owqM6sWuHo0QSHJrhqnyWS6QytkgRxd/dPbssec
         WLL1S3LK6plEe0CZNlylNSDFaFN6zxq6dQ4YGVXj7v4IRvFYZucXTDUCmaIUlRuj50i2
         nm7A==
X-Gm-Message-State: AGRZ1gJm7ePJwqySnmccdgfhqTixXmG7Ka7yJoGIh75j4agsOvyITH5r
        dH2HlgVM7HAN0yJoaUkdCGljDNF8
X-Google-Smtp-Source: 
 AJdET5cMFHntbmRIlNhnSy7k++SnORA7BhxYBbZxoSJ3GoCKH9PAlCRxBaSzETZ9k3l76cln5nQNfQ==
X-Received: by 2002:a2e:92ca:: with SMTP id
 k10-v6mr4123888ljh.103.1540621523143;
        Fri, 26 Oct 2018 23:25: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
 c81-v6sm2097487lfe.79.2018.10.26.23.25.22
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:25: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 76/78] config.txt: move web.* to a separate file
Date: Sat, 27 Oct 2018 08:23:49 +0200
Message-Id: <20181027062351.30446-77-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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/config/web.txt | 4 ++++
 2 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 Documentation/config/web.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index eacaaa2deb..10617d0a10 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -433,10 +433,7 @@ include::config/user.txt[]
 
 include::config/versionsort.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::config/web.txt[]
 
 worktree.guessRemote::
 	With `add`, if no branch argument, and neither of `-b` nor
diff --git a/Documentation/config/web.txt b/Documentation/config/web.txt
new file mode 100644
index 0000000000..beec8d1303
--- /dev/null
+++ b/Documentation/config/web.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 27 06:23: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: 10658223
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 D120214E2
	for ;
 Sat, 27 Oct 2018 06:25:30 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BDB352BF7B
	for ;
 Sat, 27 Oct 2018 06:25:30 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id B1D6D2BF74; Sat, 27 Oct 2018 06:25: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 603882BF7B
	for ;
 Sat, 27 Oct 2018 06:25:30 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728553AbeJ0PFW (ORCPT
        );
        Sat, 27 Oct 2018 11:05:22 -0400
Received: from mail-lj1-f194.google.com ([209.85.208.194]:34768 "EHLO
        mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1726610AbeJ0PFU (ORCPT );
        Sat, 27 Oct 2018 11:05:20 -0400
Received: by mail-lj1-f194.google.com with SMTP id g8-v6so216036ljk.1
        for ; Fri, 26 Oct 2018 23:25: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=mcishBF8a9yHD47CQHMlC/J2C2pUhMsDERVeLnlW7O8=;
        b=OU2n9dz7iXyGhpJ1CcmcZaSpik+LYDi++MDRwyiy1F7xdR2FYGUJw8ANcbs7bu1Jzg
         aYmB7zveVrJfKeHCQZiHr0fFCGx+3AZDtv4HtgLF5HUkPh8PdVZo/PT7TOlvPZEN6abl
         6Ibt3QMeVLwGX3+1tPmpF9MaQtKvHZPgTcvwrzBx/TIEMcuIHY34kDepExToNtRIGJ9e
         WNk9TIv0yxiE09BrECNaZ8MHi0zaWr80D8oKSJkSWaGKxCkxbmT35F8JXsTdOteZJ+nQ
         /JGrr/QUBqSZ4wnltogHHgBvUHG+cUfag3luNQ7Zb7WJtP8goC+luNINSIG0RfTNFTh9
         h6Kg==
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=mcishBF8a9yHD47CQHMlC/J2C2pUhMsDERVeLnlW7O8=;
        b=SRNR6h6n5vBHRCcyu0XoSPibCk45STSC1B86WHs35Bzxja2f8EyTWvPGFNdO4bH4wu
         anWSxAZ2ATZqdbAiAfRPNlIbEhLcLRNUlRsBbOufpPvHNAMYtZXogzHCVjiHDIUG5mzz
         R0/XIDbSMPYYi2EE7M1fCOUnTSrFpCXJY5iooNPDNrNxhvogZ1SK3RyPdJ1y70A3S6sW
         YmpTvKNtqSr2NR+1+4VjbgeBuBUrmPgprTZNKlnFQnfeDLBilmgdGH40kgO6uHP6/3TC
         Ijqn5O8jbXeGaMJwmuUdfHR8KTeyjorgg9VTyzVg6gVZRmzbDk3cmCB1u9dIzu3CS9W1
         1RlA==
X-Gm-Message-State: AGRZ1gKgZzFYA/S4Zb86rQulEd71wb9lsCpAJE2VXTMKz/QBtnDl8xJt
        JWn9HqJXTP9PVlxA6F7BhZO/bl0o
X-Google-Smtp-Source: 
 AJdET5dCPDlWnzFhU9x1bgxHxDD6WMfIE+XGDl474m5eURcCn6W5HG99vdBgjN2Iax9SZ6bBfHf4IA==
X-Received: by 2002:a2e:8e95:: with SMTP id
 z21-v6mr2968020ljk.166.1540621524450;
        Fri, 26 Oct 2018 23:25: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
 c81-v6sm2097487lfe.79.2018.10.26.23.25.23
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Fri, 26 Oct 2018 23:25: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 77/78] config.txt: move worktree.* to a separate file
Date: Sat, 27 Oct 2018 08:23:50 +0200
Message-Id: <20181027062351.30446-78-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.647.g708186aaf9
In-Reply-To: <20181027062351.30446-1-pclouds@gmail.com>
References: <20181027062351.30446-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/config/worktree.txt |  9 +++++++++
 2 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100644 Documentation/config/worktree.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 10617d0a10..75b8f6964d 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -435,12 +435,4 @@ include::config/versionsort.txt[]
 
 include::config/web.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::config/worktree.txt[]
diff --git a/Documentation/config/worktree.txt b/Documentation/config/worktree.txt
new file mode 100644
index 0000000000..b853798fc2
--- /dev/null
+++ b/Documentation/config/worktree.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.