[PATCH 1/2] Documentation/branch: document -d --force and -m --force
- From
Matthieu Moy <matthieu.moy@imag.fr>
- Date
- Jul 2, 2015, 14:07 UTC
- Message-ID
- <1435846041-19488-1-git-send-email-Matthieu.Moy@imag.fr>
The --force option was modified in 356e91f (branch: allow -f with -m and -d, 2014-12-08), but the documentation was not updated.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> --- Documentation/git-branch.txt | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 359619b..b2e7963 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -95,6 +95,10 @@ 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::
-- 2.5.0.rc0.7.ge1edd74.dirty