summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-01-27 17:51:41 +0100
committerJunio C Hamano <gitster@pobox.com>2023-01-27 17:51:41 +0100
commit8f82904caf130112a3373a63116e94e6ae31e56d (patch)
treebab06123da4731c299d0c236a1ef89bdb4c8d33a
parentMerge branch 'jk/hash-object-literally-fd-leak' (diff)
parentbranch: document `-f` and linked worktree behaviour (diff)
downloadgit-8f82904caf130112a3373a63116e94e6ae31e56d.tar.xz
git-8f82904caf130112a3373a63116e94e6ae31e56d.zip
Merge branch 'jc/doc-branch-update-checked-out-branch'
Document that "branch -f <branch>" disables only the safety to avoid recreating an existing branch. * jc/doc-branch-update-checked-out-branch: branch: document `-f` and linked worktree behaviour
-rw-r--r--Documentation/git-branch.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index aa2f78c4c2..d382ac69f7 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -123,6 +123,10 @@ OPTIONS
points to a valid commit. In combination with
`-m` (or `--move`), allow renaming the branch even if the new
branch name already exists, the same applies for `-c` (or `--copy`).
++
+Note that 'git branch -f <branchname> [<start-point>]', even with '-f',
+refuses to change an existing branch `<branchname>` that is checked out
+in another worktree linked to the same repository.
-m::
--move::