diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-12 23:51:41 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-12 23:51:41 +0300 |
| commit | 474e4f9b5567e02e9c6947e36ed84f882868d77e (patch) | |
| tree | f3f1b5b35a54047bfd6d543351b0b7216e8df990 /Documentation | |
| parent | cd9a57f6a040116f866ada47317c91262688a0ed (diff) | |
| parent | 597a97748924e8ce0b829f668acc8f7a6849b05f (diff) | |
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.txt | 3 |
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`). |