From patchwork Sat Oct 20 12:37:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10650413 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6589917D4 for ; Sat, 20 Oct 2018 12:39:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5017E2861E for ; Sat, 20 Oct 2018 12:39:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 404812862D; Sat, 20 Oct 2018 12:39:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 609C92862C for ; Sat, 20 Oct 2018 12:39:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727488AbeJTUt3 (ORCPT ); Sat, 20 Oct 2018 16:49:29 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:38696 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727289AbeJTUt2 (ORCPT ); Sat, 20 Oct 2018 16:49:28 -0400 Received: by mail-lj1-f195.google.com with SMTP id k11-v6so1112140lja.5 for ; Sat, 20 Oct 2018 05:39:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=P2zm1QOPFGoZh+KGHhYpMbDfPMoFbSl+O7+U238Qp+4=; b=Bpe6D/7w2DA23UaGmSAushaF16aWkGgT2odiG+Aa8eFEqSSK0WuntmC9JJF3pMD6tJ VD2rJFP8ILgZXnel56GayGolzBgUq7rIFO2QIptt2pkuqTOVO2Sm9eKFrXawlSvGamR4 msIPw0rZ/LdFin4gd9Z+5JCnnBMYN1/AdGaLUfHHrqUNO3Sm0IPCGWR6kHeyQ+NNGx9Q 9bxB1C9pFNSP8EG1pZKeCVe9QldvwB0xNDBQPgf8HctFl6Zv/y+epu2PsVCqh4tu+WqN yCcfYTQwken8N9CTg1qNuctsC7E10bLtTHXpSwKkABRk+gEr3Kl8fYLGfv/1Eue45Iwg H2Ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=P2zm1QOPFGoZh+KGHhYpMbDfPMoFbSl+O7+U238Qp+4=; b=cGQDkjs0NxreMmf2B1wWRMVCJjQ++BzmLYJvEyIWzz3PZPGvfB5/cV72WdodSTGkBU JHaYHgxADimYpTJ+18uH9qG8iafaXrDZeyhGBZfz3Yj/cWnPWShXDv9Wl6RlMU0CrUOs Y0asx427Wl1BqlHOUgRySpoEd4TVhNSt5wURsCrLdEOd38XhPIeu/xMT/XGbGPRmd5HU 5QtSkBQrVZ3yNF/mdylWDymDnRNiK+NyWAE1grwPv19xwiVdK/mYzqnkFh+d4HZl3hCQ 1P6fm9t/YZS+yc7g3zQufN/KgHQq2PwB0rhheYoh1QWbJWzRuHicsReDxqrtX1tMBhOj KjPA== X-Gm-Message-State: ABuFfog8a99gGpm67nTMiLrxb2pv2dt1sncMpUk7us+NmsJRWmXO55dX +2L6Ol4/tf5CMjAyq34jrWc6vzoC X-Google-Smtp-Source: ACcGV62lngGLid3eE9JEpm8Sgwz2OICj21pUhS+LAZcJdih1cDvkKQpuifl/Hjoo7TKmW4XtVsu0fw== X-Received: by 2002:a2e:52ca:: with SMTP id n71-v6mr24361876lje.54.1540039145447; Sat, 20 Oct 2018 05:39:05 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id o22-v6sm5759379ljc.79.2018.10.20.05.39.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Oct 2018 05:39:04 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH 08/59] config.txt: move branch.* to a separate file Date: Sat, 20 Oct 2018 14:37:57 +0200 Message-Id: <20181020123848.2785-9-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.647.g708186aaf9 In-Reply-To: <20181020123848.2785-1-pclouds@gmail.com> References: <20181020123848.2785-1-pclouds@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/branch-config.txt | 102 +++++++++++++++++++++++++++++++ Documentation/config.txt | 103 +------------------------------- 2 files changed, 103 insertions(+), 102 deletions(-) create mode 100644 Documentation/branch-config.txt diff --git a/Documentation/branch-config.txt b/Documentation/branch-config.txt new file mode 100644 index 0000000000..019d60ede2 --- /dev/null +++ b/Documentation/branch-config.txt @@ -0,0 +1,102 @@ +branch.autoSetupMerge:: + Tells 'git branch' and 'git checkout' to set up new branches + so that linkgit:git-pull[1] will appropriately merge from the + starting point branch. Note that even if this option is not set, + this behavior can be chosen per-branch using the `--track` + and `--no-track` options. The valid settings are: `false` -- no + automatic setup is done; `true` -- automatic setup is done when the + starting point is a remote-tracking branch; `always` -- + automatic setup is done when the starting point is either a + local branch or remote-tracking + branch. This option defaults to true. + +branch.autoSetupRebase:: + When a new branch is created with 'git branch' or 'git checkout' + that tracks another branch, this variable tells Git to set + up pull to rebase instead of merge (see "branch..rebase"). + When `never`, rebase is never automatically set to true. + When `local`, rebase is set to true for tracked branches of + other local branches. + When `remote`, rebase is set to true for tracked branches of + remote-tracking branches. + When `always`, rebase will be set to true for all tracking + branches. + See "branch.autoSetupMerge" for details on how to set up a + branch to track another branch. + This option defaults to never. + +branch.sort:: + This variable controls the sort ordering of branches when displayed by + linkgit:git-branch[1]. Without the "--sort=" option provided, the + value of this variable will be used as the default. + See linkgit:git-for-each-ref[1] field names for valid values. + +branch..remote:: + When on branch , it tells 'git fetch' and 'git push' + which remote to fetch from/push to. The remote to push to + may be overridden with `remote.pushDefault` (for all branches). + The remote to push to, for the current branch, may be further + overridden by `branch..pushRemote`. If no remote is + configured, or if you are not on any branch, it defaults to + `origin` for fetching and `remote.pushDefault` for pushing. + Additionally, `.` (a period) is the current local repository + (a dot-repository), see `branch..merge`'s final note below. + +branch..pushRemote:: + When on branch , it overrides `branch..remote` for + pushing. It also overrides `remote.pushDefault` for pushing + from branch . When you pull from one place (e.g. your + upstream) and push to another place (e.g. your own publishing + repository), you would want to set `remote.pushDefault` to + specify the remote to push to for all branches, and use this + option to override it for a specific branch. + +branch..merge:: + Defines, together with branch..remote, the upstream branch + for the given branch. It tells 'git fetch'/'git pull'/'git rebase' which + branch to merge and can also affect 'git push' (see push.default). + When in branch , it tells 'git fetch' the default + refspec to be marked for merging in FETCH_HEAD. The value is + handled like the remote part of a refspec, and must match a + ref which is fetched from the remote given by + "branch..remote". + The merge information is used by 'git pull' (which at first calls + 'git fetch') to lookup the default branch for merging. Without + this option, 'git pull' defaults to merge the first refspec fetched. + Specify multiple values to get an octopus merge. + If you wish to setup 'git pull' so that it merges into from + another branch in the local repository, you can point + branch..merge to the desired branch, and use the relative path + setting `.` (a period) for branch..remote. + +branch..mergeOptions:: + Sets default options for merging into branch . The syntax and + supported options are the same as those of linkgit:git-merge[1], but + option values containing whitespace characters are currently not + supported. + +branch..rebase:: + When true, rebase the branch on top of the fetched branch, + instead of merging the default branch from the default remote when + "git pull" is run. See "pull.rebase" for doing this in a non + branch-specific manner. ++ +When `merges`, pass the `--rebase-merges` option to 'git rebase' +so that the local merge commits are included in the rebase (see +linkgit:git-rebase[1] for details). ++ +When preserve, also pass `--preserve-merges` along to 'git rebase' +so that locally committed merge commits will not be flattened +by running 'git pull'. ++ +When the value is `interactive`, the rebase is run in interactive mode. ++ +*NOTE*: this is a possibly dangerous operation; do *not* use +it unless you understand the implications (see linkgit:git-rebase[1] +for details). + +branch..description:: + Branch description, can be edited with + `git branch --edit-description`. Branch description is + automatically added in the format-patch cover letter or + request-pull summary. diff --git a/Documentation/config.txt b/Documentation/config.txt index 910dcf1c25..249b90b107 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -301,108 +301,7 @@ include::apply-config.txt[] include::blame-config.txt[] -branch.autoSetupMerge:: - Tells 'git branch' and 'git checkout' to set up new branches - so that linkgit:git-pull[1] will appropriately merge from the - starting point branch. Note that even if this option is not set, - this behavior can be chosen per-branch using the `--track` - and `--no-track` options. The valid settings are: `false` -- no - automatic setup is done; `true` -- automatic setup is done when the - starting point is a remote-tracking branch; `always` -- - automatic setup is done when the starting point is either a - local branch or remote-tracking - branch. This option defaults to true. - -branch.autoSetupRebase:: - When a new branch is created with 'git branch' or 'git checkout' - that tracks another branch, this variable tells Git to set - up pull to rebase instead of merge (see "branch..rebase"). - When `never`, rebase is never automatically set to true. - When `local`, rebase is set to true for tracked branches of - other local branches. - When `remote`, rebase is set to true for tracked branches of - remote-tracking branches. - When `always`, rebase will be set to true for all tracking - branches. - See "branch.autoSetupMerge" for details on how to set up a - branch to track another branch. - This option defaults to never. - -branch.sort:: - This variable controls the sort ordering of branches when displayed by - linkgit:git-branch[1]. Without the "--sort=" option provided, the - value of this variable will be used as the default. - See linkgit:git-for-each-ref[1] field names for valid values. - -branch..remote:: - When on branch , it tells 'git fetch' and 'git push' - which remote to fetch from/push to. The remote to push to - may be overridden with `remote.pushDefault` (for all branches). - The remote to push to, for the current branch, may be further - overridden by `branch..pushRemote`. If no remote is - configured, or if you are not on any branch, it defaults to - `origin` for fetching and `remote.pushDefault` for pushing. - Additionally, `.` (a period) is the current local repository - (a dot-repository), see `branch..merge`'s final note below. - -branch..pushRemote:: - When on branch , it overrides `branch..remote` for - pushing. It also overrides `remote.pushDefault` for pushing - from branch . When you pull from one place (e.g. your - upstream) and push to another place (e.g. your own publishing - repository), you would want to set `remote.pushDefault` to - specify the remote to push to for all branches, and use this - option to override it for a specific branch. - -branch..merge:: - Defines, together with branch..remote, the upstream branch - for the given branch. It tells 'git fetch'/'git pull'/'git rebase' which - branch to merge and can also affect 'git push' (see push.default). - When in branch , it tells 'git fetch' the default - refspec to be marked for merging in FETCH_HEAD. The value is - handled like the remote part of a refspec, and must match a - ref which is fetched from the remote given by - "branch..remote". - The merge information is used by 'git pull' (which at first calls - 'git fetch') to lookup the default branch for merging. Without - this option, 'git pull' defaults to merge the first refspec fetched. - Specify multiple values to get an octopus merge. - If you wish to setup 'git pull' so that it merges into from - another branch in the local repository, you can point - branch..merge to the desired branch, and use the relative path - setting `.` (a period) for branch..remote. - -branch..mergeOptions:: - Sets default options for merging into branch . The syntax and - supported options are the same as those of linkgit:git-merge[1], but - option values containing whitespace characters are currently not - supported. - -branch..rebase:: - When true, rebase the branch on top of the fetched branch, - instead of merging the default branch from the default remote when - "git pull" is run. See "pull.rebase" for doing this in a non - branch-specific manner. -+ -When `merges`, pass the `--rebase-merges` option to 'git rebase' -so that the local merge commits are included in the rebase (see -linkgit:git-rebase[1] for details). -+ -When preserve, also pass `--preserve-merges` along to 'git rebase' -so that locally committed merge commits will not be flattened -by running 'git pull'. -+ -When the value is `interactive`, the rebase is run in interactive mode. -+ -*NOTE*: this is a possibly dangerous operation; do *not* use -it unless you understand the implications (see linkgit:git-rebase[1] -for details). - -branch..description:: - Branch description, can be edited with - `git branch --edit-description`. Branch description is - automatically added in the format-patch cover letter or - request-pull summary. +include::branch-config.txt[] browser..cmd:: Specify the command to invoke the specified browser. The