summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-10-12 13:51:41 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-10-12 13:51:41 -0700
commit474e4f9b5567e02e9c6947e36ed84f882868d77e (patch)
treef3f1b5b35a54047bfd6d543351b0b7216e8df990 /Documentation
parentMerge branch 'mt/quiet-with-delayed-checkout' into maint (diff)
parentbranch: allow deleting dangling branches with --force (diff)
downloadtgif-474e4f9b5567e02e9c6947e36ed84f882868d77e.tar.xz
Merge branch 'rs/branch-allow-deleting-dangling' into maint
"git branch -D <branch>" used to refuse to remove a broken branch ref that points at a missing commit, which has been corrected. * rs/branch-allow-deleting-dangling: branch: allow deleting dangling branches with --force
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-branch.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 94dc9a54f2..5449767121 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -118,7 +118,8 @@ OPTIONS
Reset <branchname> to <startpoint>, even if <branchname> exists
already. Without `-f`, 'git branch' refuses to change an existing branch.
In combination with `-d` (or `--delete`), allow deleting the
- branch irrespective of its merged status. In combination with
+ branch irrespective of its merged status, or whether it even
+ 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`).