From: Jari Aalto <jari.aalto@xxxxxxxxx> Signed-off-by: Jari Aalto <jari.aalto@xxxxxxxxx> --- Documentation/git-branch.txt | 108 +++++++++++++++++++++--------------------- 1 files changed, 54 insertions(+), 54 deletions(-) diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 9106d38..b4a56f9 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -63,6 +63,23 @@ way to clean up all obsolete remote-tracking branches. OPTIONS ------- + +-a:: + List both remote-tracking branches and local branches. + +--abbrev=<length>:: + Alter the sha1's minimum display length in the output listing. + The default value is 7. See also `--no-abbrev'. + +--color[=<when>]:: + Color branches to highlight current, local, and + remote-tracking branches. + The value must be always (the default), never, or auto. See + also `--no-color'. + +--contains <commit>:: + Only list branches which contain the specified commit. + -d:: Delete a branch. The branch must be fully merged in its upstream branch, or in `HEAD` if no upstream was set with @@ -71,6 +88,11 @@ OPTIONS -D:: Delete a branch irrespective of its merged status. +-f:: +--force:: + Reset <branchname> to <startpoint> if <branchname> exists + already. Without `-f` 'git branch' refuses to change an existing branch. + -l:: Create the branch's reflog. This activates recording of all changes made to the branch ref, enabling use of date @@ -78,45 +100,39 @@ OPTIONS Note that in non-bare repositories, reflogs are usually enabled by default by the `core.logallrefupdates` config option. --f:: ---force:: - Reset <branchname> to <startpoint> if <branchname> exists - already. Without `-f` 'git branch' refuses to change an existing branch. - -m:: Move/rename a branch and the corresponding reflog. +--merged [<commit>]:: + Only list branches whose tips are reachable from the + specified commit (HEAD if not specified). See also `--no-merged'. + -M:: Move/rename a branch even if the new branch name already exists. ---color[=<when>]:: - Color branches to highlight current, local, and - remote-tracking branches. - The value must be always (the default), never, or auto. +--no-abbrev:: + Display the full sha1s in the output listing rather than abbreviating them. --no-color:: Turn off branch colors, even when the configuration file gives the - default to color output. - Same as `--color=never`. + default to color output. Same as `--color=never`. --r:: - List or delete (if used with -d) the remote-tracking branches. - --a:: - List both remote-tracking branches and local branches. +--no-merged [<commit>]:: + Only list branches whose tips are not reachable from the + specified commit (HEAD if not specified). --v:: ---verbose:: - Show sha1 and commit subject line for each head, along with - relationship to upstream branch (if any). If given twice, print - the name of the upstream branch, as well. +--no-track:: + Do not set up "upstream" configuration, even if the + branch.autosetupmerge configuration variable is true. ---abbrev=<length>:: - Alter the sha1's minimum display length in the output listing. - The default value is 7. +-r:: + List or delete (if used with -d) the remote-tracking branches. ---no-abbrev:: - Display the full sha1s in the output listing rather than abbreviating them. +--set-upstream:: + If specified branch does not exist yet or if '--force' has been + given, acts exactly like '--track'. Otherwise sets up configuration + like '--track' would when creating the branch, except that where + branch points to is not changed. -t:: --track:: @@ -133,26 +149,11 @@ want `git checkout` and `git branch` to always behave as if '--no-track' were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch. ---no-track:: - Do not set up "upstream" configuration, even if the - branch.autosetupmerge configuration variable is true. - ---set-upstream:: - If specified branch does not exist yet or if '--force' has been - given, acts exactly like '--track'. Otherwise sets up configuration - like '--track' would when creating the branch, except that where - branch points to is not changed. - ---contains <commit>:: - Only list branches which contain the specified commit. - ---merged [<commit>]:: - Only list branches whose tips are reachable from the - specified commit (HEAD if not specified). - ---no-merged [<commit>]:: - Only list branches whose tips are not reachable from the - specified commit (HEAD if not specified). +-v:: +--verbose:: + Show sha1 and commit subject line for each head, along with + relationship to upstream branch (if any). If given twice, print + the name of the upstream branch, as well. <branchname>:: The name of the branch to create or delete. @@ -160,18 +161,17 @@ start-point is either a local or remote-tracking branch. linkgit:git-check-ref-format[1]. Some of these checks may restrict the characters allowed in a branch name. -<start-point>:: - The new branch head will point to this commit. It may be - given as a branch name, a commit-id, or a tag. If this - option is omitted, the current HEAD will be used instead. - -<oldbranch>:: - The name of an existing branch to rename. - <newbranch>:: The new name for an existing branch. The same restrictions as for <branchname> apply. +<oldbranch>:: + The name of an existing branch to rename. + +<start-point>:: + The new branch head will point to this commit. It may be + given as a branch name, a commit-id, or a tag. If this + option is omitted, the current HEAD will be used instead. Examples -------- -- 1.7.2.3 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html