diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-09-08 23:30:32 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-09-08 23:30:32 +0300 |
commit | ec8d24f05df6966d229e2078da78ea46aea7b41c (patch) | |
tree | 30dfc0d377ac9db670439ff5c621dbb1357b0dde /Documentation | |
parent | f0d795428e28fbfe6e86be0779e3d2fbfbdc73b4 (diff) | |
parent | 597a97748924e8ce0b829f668acc8f7a6849b05f (diff) |
Merge branch 'rs/branch-allow-deleting-dangling'
"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`). |