undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-branch: introduce missing long forms for the options

Browse Source 
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 <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael J Gruber 2011-08-28 16:54:30 +02:00 committed by Junio C Hamano
parent c97eff5a95
commit 171edcbb49
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/git-branch.txt
View File

@ -64,6 +64,7 @@ way to clean up all obsolete remote-tracking branches.
OPTIONS OPTIONS
------- -------
-d:: -d::
--delete::
Delete a branch. The branch must be fully merged in its Delete a branch. The branch must be fully merged in its
upstream branch, or in `HEAD` if no upstream was set with upstream branch, or in `HEAD` if no upstream was set with
`--track` or `--set-upstream`. `--track` or `--set-upstream`.
@ -72,6 +73,7 @@ OPTIONS
Delete a branch irrespective of its merged status. Delete a branch irrespective of its merged status.
-l:: -l::
--create-reflog::
Create the branch's reflog. This activates recording of Create the branch's reflog. This activates recording of
all changes made to the branch ref, enabling use of date all changes made to the branch ref, enabling use of date
based sha1 expressions such as "<branchname>@\{yesterday}". based sha1 expressions such as "<branchname>@\{yesterday}".
@ -84,6 +86,7 @@ OPTIONS
already. Without `-f` 'git branch' refuses to change an existing branch. already. Without `-f` 'git branch' refuses to change an existing branch.
-m:: -m::
--move::
Move/rename a branch and the corresponding reflog. Move/rename a branch and the corresponding reflog.
-M:: -M::
@ -100,9 +103,11 @@ OPTIONS
Same as `--color=never`. Same as `--color=never`.
-r:: -r::
--remotes::
List or delete (if used with -d) the remote-tracking branches. List or delete (if used with -d) the remote-tracking branches.
-a:: -a::
--all::
List both remote-tracking branches and local branches. List both remote-tracking branches and local branches.
-v:: -v::

10
builtin/branch.c
View File

@ -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_SET_INT( 0, "set-upstream", &track, "change upstream info",
BRANCH_TRACK_OVERRIDE), BRANCH_TRACK_OVERRIDE),
OPT__COLOR(&branch_use_color, "use colored output"), 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",
REF_REMOTE_BRANCH), REF_REMOTE_BRANCH),
{ {
OPTION_CALLBACK, 0, "contains", &with_commit, "commit", OPTION_CALLBACK, 0, "contains", &with_commit, "commit",
@ -645,13 +645,13 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
OPT__ABBREV(&abbrev), OPT__ABBREV(&abbrev),
OPT_GROUP("Specific git-branch actions:"), 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",
REF_REMOTE_BRANCH | REF_LOCAL_BRANCH), REF_REMOTE_BRANCH | REF_LOCAL_BRANCH),
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('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_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)"), OPT__FORCE(&force_create, "force creation (when already exists)"),
{ {
OPTION_CALLBACK, 0, "no-merged", &merge_filter_ref, OPTION_CALLBACK, 0, "no-merged", &merge_filter_ref,