diff options
authorMichael J Gruber <>2011-08-28 14:54:30 (GMT)
committerJunio C Hamano <>2011-08-29 05:48:14 (GMT)
commit171edcbb49df30bbe96cc7f7204549df22c1beee (patch)
parentc97eff5a95d57a9561b7c7429e7fcc5d0e3a7f5d (diff)
git-branch: introduce missing long forms for the options
Long forms are better to memorize and more reliably uniform across commands. Names follow precedents, e.g. "git log --remotes". Signed-off-by: Michael J Gruber <> Signed-off-by: Junio C Hamano <>
2 files changed, 10 insertions, 5 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 507b8d0..4c64ac9 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -64,6 +64,7 @@ way to clean up all obsolete remote-tracking branches.
Delete a branch. The branch must be fully merged in its
upstream branch, or in `HEAD` if no upstream was set with
`--track` or `--set-upstream`.
@@ -72,6 +73,7 @@ OPTIONS
Delete a branch irrespective of its merged status.
Create the branch's reflog. This activates recording of
all changes made to the branch ref, enabling use of date
based sha1 expressions such as "<branchname>@\{yesterday}".
@@ -84,6 +86,7 @@ OPTIONS
already. Without `-f` 'git branch' refuses to change an existing branch.
Move/rename a branch and the corresponding reflog.
@@ -100,9 +103,11 @@ OPTIONS
Same as `--color=never`.
List or delete (if used with -d) the remote-tracking branches.
List both remote-tracking branches and local branches.
diff --git a/builtin/branch.c b/builtin/branch.c
index 953bc1c..bd3a315 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -628,7 +628,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
OPT_SET_INT( 0, "set-upstream", &track, "change upstream info",
OPT__COLOR(&branch_use_color, "use colored output"),
- OPT_SET_INT('r', NULL, &kinds, "act on remote-tracking branches",
+ OPT_SET_INT('r', "remotes", &kinds, "act on remote-tracking branches",
OPTION_CALLBACK, 0, "contains", &with_commit, "commit",
@@ -645,13 +645,13 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
OPT_GROUP("Specific git-branch actions:"),
- OPT_SET_INT('a', NULL, &kinds, "list both remote-tracking and local branches",
+ OPT_SET_INT('a', "all", &kinds, "list both remote-tracking and local branches",
- OPT_BIT('d', NULL, &delete, "delete fully merged branch", 1),
+ OPT_BIT('d', "delete", &delete, "delete fully merged branch", 1),
OPT_BIT('D', NULL, &delete, "delete branch (even if not merged)", 2),
- OPT_BIT('m', NULL, &rename, "move/rename a branch and its reflog", 1),
+ OPT_BIT('m', "move", &rename, "move/rename a branch and its reflog", 1),
OPT_BIT('M', NULL, &rename, "move/rename a branch, even if target exists", 2),
- OPT_BOOLEAN('l', NULL, &reflog, "create the branch's reflog"),
+ OPT_BOOLEAN('l', "create-reflog", &reflog, "create the branch's reflog"),
OPT__FORCE(&force_create, "force creation (when already exists)"),
OPTION_CALLBACK, 0, "no-merged", &merge_filter_ref,