diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-07-10 15:29:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-10 15:29:34 -0700 |
| commit | 823eebb8a31b328e252543cfa25ebf5c575fa6d8 (patch) | |
| tree | dfd5992a4dc3ebf603b43ea8b24f3c47e7b7796d /git-branch.txt | |
| parent | 2f7978279c72985d4856b2bd0fdde97473366213 (diff) | |
| download | git-htmldocs-823eebb8a31b328e252543cfa25ebf5c575fa6d8.tar.gz | |
Autogenerated HTML docs for v2.5.0-rc1-32-ge59f6
Diffstat (limited to 'git-branch.txt')
| -rw-r--r-- | git-branch.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/git-branch.txt b/git-branch.txt index 359619b55..a67138a02 100644 --- a/git-branch.txt +++ b/git-branch.txt @@ -81,7 +81,7 @@ OPTIONS `--track` or `--set-upstream`. -D:: - Delete a branch irrespective of its merged status. + Shortcut for `--delete --force`. -l:: --create-reflog:: @@ -95,13 +95,17 @@ OPTIONS --force:: Reset <branchname> to <startpoint> 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 + `-m` (or `--move`), allow renaming the branch even if the new + branch name already exists. -m:: --move:: Move/rename a branch and the corresponding reflog. -M:: - Move/rename a branch even if the new branch name already exists. + Shortcut for `--move --force`. --color[=<when>]:: Color branches to highlight current, local, and |