aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-02-14 14:15:52 -0800
committerJunio C Hamano <gitster@pobox.com>2023-02-14 14:15:52 -0800
commit26fc32604455486503e1a6dcde835eaf2b6d7999 (patch)
tree3bd8ffe07c0e0d29b8ec86c3027b0f4c0a1ce252
parentMerge branch 'rs/ls-tree-path-expansion-fix' into maint-2.39 (diff)
parentbranch: document `-f` and linked worktree behaviour (diff)
downloadgit-26fc32604455486503e1a6dcde835eaf2b6d7999.tar.gz
git-26fc32604455486503e1a6dcde835eaf2b6d7999.zip
Merge branch 'jc/doc-branch-update-checked-out-branch' into maint-2.39
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 12c5f84e3b..2aaf13b45d 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::