[PATCH 3/3] branch documentation: new autosetupmerge option "simple"

From

Tao Klerks via GitGitGadget <gitgitgadget@gmail.com>

Date

Feb 24, 2022, 09:45 UTC

Message-ID

<39c14906e7b65843c2543682bb577c6a2253240a.1645695940.git.gitgitgadget@gmail.com>

In-Reply-To

<pull.1161.git.1645695940.gitgitgadget@gmail.com>

From: Tao Klerks <tao@klerks.biz>

Signed-off-by: Tao Klerks <tao@klerks.biz>
---
 Documentation/config/branch.txt | 4 +++-
 Documentation/git-branch.txt    | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Documentation/config/branch.txt b/Documentation/config/branch.txt
index 1e0c7af014b..7b4e5ca5b74 100644
--- a/Documentation/config/branch.txt
+++ b/Documentation/config/branch.txt
@@ -9,7 +9,9 @@ branch.autoSetupMerge::
 	automatic setup is done when the starting point is either a
 	local branch or remote-tracking branch; `inherit` -- if the starting point
 	has a tracking configuration, it is copied to the new
-	branch. This option defaults to true.
+	branch; `simple` -- automatic setup is done when the starting point is
+	a remote-tracking branch and the new branch has the same name as the
+	remote branch. This option defaults to true.
 
 branch.autoSetupRebase::
 	When a new branch is created with 'git branch', 'git switch' or 'git checkout'
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index c8b4f9ce3c7..f99d6a6b008 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -227,7 +227,9 @@ want `git switch`, `git checkout` and `git branch` to always behave as if `--no-
 were given. Set it to `always` if you want this behavior when the
 start-point is either a local or remote-tracking branch. Set it to
 `inherit` if you want to copy the tracking configuration from the
-branch point.
+branch point. Set it to `simple` if you want this behavior only when
+the start-point is a remote branch and the new branch has the same name
+as the remote branch.
 +
 See linkgit:git-pull[1] and linkgit:git-config[1] for additional discussion on
 how the `branch.<name>.remote` and `branch.<name>.merge` options are used.

-- 
gitgitgadget