@@ -35,6 +35,13 @@ This option defaults to `never`.
 	value of this variable will be used as the default.
 	See linkgit:git-for-each-ref[1] field names for valid values.
 
+`branch.addCurrentBranchAsPrefix`::
+	When a new branch is created with `git branch`, `git switch` or `git
+	checkout` use the name of the current branch as a prefix for the new
+	branch's name, alongside the one provided by the user, with a hyphen in the
+	middle. For instance, using this configuration variable, creating the branch
+	`test` while on `main` will create the branch `main-test`. False by default.
+
 `branch.<name>.remote`::
 	When on branch _<name>_, it tells `git fetch` and `git push`
 	which remote to fetch from or push to.  The remote to push to

@@ -365,6 +365,20 @@ int read_branch_desc(struct strbuf *buf, const char *branch_name)
 	return 0;
 }
 
+void add_branch_prefix(const char *current_branch,
+					   const char *target_branch, struct strbuf *buf)
+{
+	int value = 0;
+
+	repo_config_get_bool(the_repository,
+						 "branch.addCurrentBranchAsPrefix", &value);
+
+	if (value)
+		strbuf_addf(buf, "%s-%s", current_branch, target_branch);
+	else
+		strbuf_addstr(buf, target_branch);
+}
+
 /*
  * Check if 'name' can be a valid name for a branch; die otherwise.
  * Return 1 if the named branch already exists; return 0 otherwise.

@@ -148,6 +148,14 @@ int install_branch_config(int flag, const char *local, const char *origin, const
  */
 int read_branch_desc(struct strbuf *, const char *branch_name);
 
+/*
+ * Fetch the configuration parameter 'branch.addCurrentBranchAsPrefix' and
+ * fill the buffer 'buf' with '<current_branch>-<target_branch>' if true,
+ * otherwise just '<current_branch>'.
+ */
+void add_branch_prefix(const char *current_branch,
+					   const char *target_branch, struct strbuf *buf);
+
 /*
  * Check if a branch is checked out in the main worktree or any linked
  * worktree and die (with a message describing its checkout location) if

@@ -995,6 +995,7 @@ int cmd_branch(int argc,
 	} else if (!noncreate_actions && argc > 0 && argc <= 2) {
 		const char *branch_name = argv[0];
 		const char *start_name = argc == 2 ? argv[1] : head;
+		struct strbuf new_branch_name = STRBUF_INIT;
 
 		if (filter.kind != FILTER_REFS_BRANCHES)
 			die(_("the -a, and -r, options to 'git branch' do not take a branch name.\n"

@@ -1003,15 +1004,17 @@ int cmd_branch(int argc,
 		if (track == BRANCH_TRACK_OVERRIDE)
 			die(_("the '--set-upstream' option is no longer supported. Please use '--track' or '--set-upstream-to' instead"));
 
-		if (recurse_submodules) {
-			create_branches_recursively(the_repository, branch_name,
+		add_branch_prefix(start_name, branch_name, &new_branch_name);
+
+		if (recurse_submodules)
+			create_branches_recursively(the_repository, new_branch_name.buf,
 						    start_name, NULL, force,
 						    reflog, quiet, track, 0);
-			ret = 0;
-			goto out;
-		}
-		create_branch(the_repository, branch_name, start_name, force, 0,
-			      reflog, quiet, track, 0);
+		else
+			create_branch(the_repository, new_branch_name.buf, start_name,
+						  force, 0, reflog, quiet, track, 0);
+
+		strbuf_release(&new_branch_name);
 	} else
 		usage_with_options(builtin_branch_usage, options);
 

@@ -1170,31 +1170,42 @@ static void orphaned_commit_warning(struct commit *old_commit, struct commit *ne
 	release_revisions(&revs);
 }
 
+static void get_current_branch_info(struct branch_info *branch_info)
+{
+	struct object_id rev;
+	int flag;
+
+	branch_info->path = refs_resolve_refdup(get_main_ref_store(the_repository),
+											"HEAD", 0, &rev, &flag);
+
+	if (branch_info->path)
+		branch_info->commit = lookup_commit_reference_gently(the_repository,
+															 &rev, 1);
+
+	if (!(flag & REF_ISSYMREF))
+		FREE_AND_NULL(branch_info->path);
+
+	if (branch_info->path) {
+		const char *const prefix = "refs/heads/";
+		const char *p;
+
+		if (skip_prefix(branch_info->path, prefix, &p))
+			branch_info->name = xstrdup(p);
+	}
+}
+
 static int switch_branches(const struct checkout_opts *opts,
 			   struct branch_info *new_branch_info)
 {
 	int ret = 0;
 	struct branch_info old_branch_info = { 0 };
-	struct object_id rev;
-	int flag, writeout_error = 0;
+	int writeout_error = 0;
 	int do_merge = 1;
 
 	trace2_cmd_mode("branch");
 
 	memset(&old_branch_info, 0, sizeof(old_branch_info));
-	old_branch_info.path = refs_resolve_refdup(get_main_ref_store(the_repository),
-						   "HEAD", 0, &rev, &flag);
-	if (old_branch_info.path)
-		old_branch_info.commit = lookup_commit_reference_gently(the_repository, &rev, 1);
-	if (!(flag & REF_ISSYMREF))
-		FREE_AND_NULL(old_branch_info.path);
-
-	if (old_branch_info.path) {
-		const char *const prefix = "refs/heads/";
-		const char *p;
-		if (skip_prefix(old_branch_info.path, prefix, &p))
-			old_branch_info.name = xstrdup(p);
-	}
+	get_current_branch_info(&old_branch_info);
 
 	if (opts->new_orphan_branch && opts->orphan_from_empty_tree) {
 		if (new_branch_info->name)

@@ -1772,6 +1783,7 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
 	int parseopt_flags = 0;
 	struct branch_info new_branch_info = { 0 };
 	int ret;
+	struct strbuf full_branch_name = { 0 };
 
 	opts->overwrite_ignore = 1;
 	opts->prefix = prefix;

@@ -1962,7 +1974,15 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
 	}
 
 	if (opts->new_branch) {
+		struct branch_info current_branch = { 0 };
 		struct strbuf buf = STRBUF_INIT;
+		strbuf_init(&full_branch_name, 0);
+
+		get_current_branch_info(&current_branch);
+		add_branch_prefix(current_branch.name, opts->new_branch,
+						  &full_branch_name);
+		branch_info_release(&current_branch);
+		opts->new_branch = full_branch_name.buf;
 
 		if (opts->new_branch_force)
 			opts->branch_exists = validate_branchname(opts->new_branch, &buf);

@@ -1981,6 +2001,8 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
 	clear_pathspec(&opts->pathspec);
 	free(opts->pathspec_from_file);
 	free(options);
+	if (full_branch_name.buf)
+		strbuf_release(&full_branch_name);
 
 	return ret;
 }

@@ -285,4 +285,30 @@ test_expect_success 'checkout -b rejects an extra path argument' '
 	test_grep "Cannot update paths and switch to branch" err
 '
 
+test_expect_success 'checkout -b with prefix is valid' '
+	git checkout -b main &&
+	git checkout -b checkoutb-with-prefix &&
+	git checkout main &&
+	test_config branch.addCurrentBranchAsPrefix false &&
+	test_must_fail git checkout -b checkoutb-with-prefix &&
+	test_config branch.addCurrentBranchAsPrefix true &&
+	git checkout -b checkoutb-with-prefix &&
+	git checkout -b checkoutb-with-prefix &&
+	test_ref_exists refs/heads/checkoutb-with-prefix &&
+	test_ref_exists refs/heads/main-checkoutb-with-prefix &&
+	test_ref_exists refs/heads/main-checkoutb-with-prefix-checkoutb-with-prefix
+'
+
+test_expect_success 'checkout -B with prefix is valid' '
+	git checkout main &&
+	git checkout -B checkoutB-with-prefix &&
+	git checkout main &&
+	test_config branch.addCurrentBranchAsPrefix false &&
+	git checkout -B checkoutB-with-prefix &&
+	test_config branch.addCurrentBranchAsPrefix true &&
+	git checkout -B checkoutB-with-prefix &&
+	test_ref_exists refs/heads/checkoutB-with-prefix &&
+	test_ref_exists refs/heads/checkoutB-with-prefix-checkoutB-with-prefix
+'
+
 test_done

@@ -177,4 +177,30 @@ test_expect_success 'switch back when temporarily detached and checked out elsew
 	git -C wt2 switch --ignore-other-worktrees shared
 '
 
+test_expect_success 'switch -c with prefix is valid' '
+	git switch main &&
+	git switch -c switchc-with-prefix &&
+	git checkout main &&
+	test_config branch.addCurrentBranchAsPrefix false &&
+	test_must_fail git switch -c switchc-with-prefix &&
+	test_config branch.addCurrentBranchAsPrefix true &&
+	git switch -c switchc-with-prefix &&
+	git switch -c switchc-with-prefix &&
+	test_ref_exists refs/heads/switchc-with-prefix &&
+	test_ref_exists refs/heads/main-switchc-with-prefix &&
+	test_ref_exists refs/heads/main-switchc-with-prefix-switchc-with-prefix
+'
+
+test_expect_success 'switch -C with prefix is valid' '
+	git switch main &&
+	git switch -C switchC-with-prefix &&
+	git checkout main &&
+	test_config branch.addCurrentBranchAsPrefix false &&
+	git switch -C switchC-with-prefix &&
+	test_config branch.addCurrentBranchAsPrefix true &&
+	git switch -C switchC-with-prefix &&
+	test_ref_exists refs/heads/switchC-with-prefix &&
+	test_ref_exists refs/heads/switchC-with-prefix-switchC-with-prefix
+'
+
 test_done

@@ -1716,4 +1716,18 @@ test_expect_success 'errors if given a bad branch name' '
 	test_cmp expect actual
 '
 
+test_expect_success 'create branch with prefix' '
+	git config branch.autosetupmerge false &&
+	git branch branch-with-prefix &&
+	test_config branch.addCurrentBranchAsPrefix false &&
+	test_must_fail git branch branch-with-prefix &&
+	test_config branch.addCurrentBranchAsPrefix true &&
+	git branch branch-with-prefix &&
+	git checkout branch-with-prefix &&
+	git branch branch-with-prefix &&
+	test_ref_exists refs/heads/branch-with-prefix &&
+	test_ref_exists refs/heads/main-branch-with-prefix &&
+	test_ref_exists refs/heads/branch-with-prefix-branch-with-prefix
+'
+
 test_done