{"thread":{"id":"39768","subject":"[PATCH 2/2] Documentation/branch: document -M and -D in terms of --force","startedAt":"2015-07-02T14:07:20Z","lastAt":"2015-07-02T14:07:21Z","messageCount":2,"participants":["Matthieu Moy"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"265399","messageId":"1435846041-19488-1-git-send-email-Matthieu.Moy@imag.fr","threadId":"39768","inReplyTo":null,"subject":"[PATCH 1/2] Documentation/branch: document -d --force and -m --force","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@imag.fr","sentAt":"2015-07-02T14:07:20Z","receivedAt":"2015-07-02T14:07:20Z","isPatch":true,"sender":{"key":"git@matthieu-moy.fr","avatar":"https://avatars.githubusercontent.com/u/14709?v=4"},"body":"The --force option was modified in 356e91f (branch: allow -f with -m and\n-d, 2014-12-08), but the documentation was not updated.\n\nSigned-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>\n---\n Documentation/git-branch.txt | 4 ++++\n 1 file changed, 4 insertions(+)\n\ndiff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt\nindex 359619b..b2e7963 100644\n--- a/Documentation/git-branch.txt\n+++ b/Documentation/git-branch.txt\n@@ -95,6 +95,10 @@ OPTIONS\n --force::\n \tReset <branchname> to <startpoint> if <branchname> exists\n \talready. Without `-f` 'git branch' refuses to change an existing branch.\n+\tIn combination with `-d` (or `--delete`), allow deleting the\n+\tbranch irrespective of its merged status. In combination with\n+\t`-m` (or `--move`), allow renaming the branch even if the new\n+\tbranch name already exists.\n \n -m::\n --move::\n-- \n2.5.0.rc0.7.ge1edd74.dirty\n"},{"id":"265398","messageId":"1435846041-19488-2-git-send-email-Matthieu.Moy@imag.fr","threadId":"39768","inReplyTo":"1435846041-19488-1-git-send-email-Matthieu.Moy@imag.fr","subject":"[PATCH 2/2] Documentation/branch: document -M and -D in terms of --force","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@imag.fr","sentAt":"2015-07-02T14:07:21Z","receivedAt":"2015-07-02T14:07:21Z","isPatch":true,"sender":{"key":"git@matthieu-moy.fr","avatar":"https://avatars.githubusercontent.com/u/14709?v=4"},"body":"Now that we have proper documentation for --force's interaction with -d\nand -m, we can avoid duplication and consider -M and -D as convenience\naliases for -m --force and -d --force.\n\nSigned-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>\n---\nI'm not 100% sure it's a good idea (too many levels of indirections in\na documentation can make it painful), so if people don't like this\npatch, I won't fight for it. The important is PATCH 1/2.\n\n Documentation/git-branch.txt | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt\nindex b2e7963..a67138a 100644\n--- a/Documentation/git-branch.txt\n+++ b/Documentation/git-branch.txt\n@@ -81,7 +81,7 @@ OPTIONS\n \t`--track` or `--set-upstream`.\n \n -D::\n-\tDelete a branch irrespective of its merged status.\n+\tShortcut for `--delete --force`.\n \n -l::\n --create-reflog::\n@@ -105,7 +105,7 @@ OPTIONS\n \tMove/rename a branch and the corresponding reflog.\n \n -M::\n-\tMove/rename a branch even if the new branch name already exists.\n+\tShortcut for `--move --force`.\n \n --color[=<when>]::\n \tColor branches to highlight current, local, and\n-- \n2.5.0.rc0.7.ge1edd74.dirty\n"}]}