[PATCH 2/2] Documentation/branch: document -M and -D in terms of --force
- From
Matthieu Moy <matthieu.moy@imag.fr>
- Date
- Jul 2, 2015, 14:07 UTC
- Message-ID
- <1435846041-19488-2-git-send-email-Matthieu.Moy@imag.fr>
- In-Reply-To
- <1435846041-19488-1-git-send-email-Matthieu.Moy@imag.fr>
Now that we have proper documentation for --force's interaction with -d and -m, we can avoid duplication and consider -M and -D as convenience aliases for -m --force and -d --force.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> --- I'm not 100% sure it's a good idea (too many levels of indirections in a documentation can make it painful), so if people don't like this patch, I won't fight for it. The important is PATCH 1/2.
Documentation/git-branch.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index b2e7963..a67138a 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/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:: @@ -105,7 +105,7 @@ OPTIONS 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
-- 2.5.0.rc0.7.ge1edd74.dirty