mirror of
https://github.com/git/git.git
synced 2024-12-04 15:34:05 +08:00
a5c8a98ca7
* master: (90 commits) fetch.c: remove an unused variable and dead code. Clean up sha1 file writing Builtin git-cat-file builtin format-patch: squelch content-type for 7-bit ASCII CMIT_FMT_EMAIL: Q-encode Subject: and display-name part of From: fields. add more informative error messages to git-mktag remove the artificial restriction tagsize < 8kb git-rebase: use canonical A..B syntax to format-patch git-format-patch: now built-in. fmt-patch: Support --attach fmt-patch: understand old <his> notation Teach fmt-patch about --keep-subject Teach fmt-patch about --numbered fmt-patch: implement -o <dir> fmt-patch: output file names to stdout Teach fmt-patch to write individual files. built-in tar-tree and remote tar-tree Builtin git-diff-files, git-diff-index, git-diff-stages, and git-diff-tree. Builtin git-show-branch. Builtin git-apply. ...
110 lines
2.7 KiB
Plaintext
110 lines
2.7 KiB
Plaintext
git-branch(1)
|
|
=============
|
|
|
|
NAME
|
|
----
|
|
git-branch - List, create, or delete branches.
|
|
|
|
SYNOPSIS
|
|
--------
|
|
[verse]
|
|
'git-branch' [-r]
|
|
'git-branch' [-l] [-f] <branchname> [<start-point>]
|
|
'git-branch' (-d | -D) <branchname>...
|
|
|
|
DESCRIPTION
|
|
-----------
|
|
With no arguments given (or just `-r`) a list of available branches
|
|
will be shown, the current branch will be highlighted with an asterisk.
|
|
|
|
In its second form, a new branch named <branchname> will be created.
|
|
It will start out with a head equal to the one given as <start-point>.
|
|
If no <start-point> is given, the branch will be created with a head
|
|
equal to that of the currently checked out branch.
|
|
|
|
With a `-d` or `-D` option, `<branchname>` will be deleted. You may
|
|
specify more than one branch for deletion. If the branch currently
|
|
has a ref log then the ref log will also be deleted.
|
|
|
|
|
|
OPTIONS
|
|
-------
|
|
-d::
|
|
Delete a branch. The branch must be fully merged.
|
|
|
|
-D::
|
|
Delete a branch irrespective of its index status.
|
|
|
|
-l::
|
|
Create the branch's ref log. This activates recording of
|
|
all changes to made the branch ref, enabling use of date
|
|
based sha1 expressions such as "<branchname>@{yesterday}".
|
|
|
|
-f::
|
|
Force the creation of a new branch even if it means deleting
|
|
a branch that already exists with the same name.
|
|
|
|
-r::
|
|
List only the "remote" branches.
|
|
|
|
<branchname>::
|
|
The name of the branch to create or delete.
|
|
The new branch name must pass all checks defined by
|
|
gitlink:git-check-ref-format[1]. Some of these checks
|
|
may restrict the characters allowed in a branch name.
|
|
|
|
<start-point>::
|
|
The new branch will be created with a HEAD equal to this. It may
|
|
be given as a branch name, a commit-id, or a tag. If this option
|
|
is omitted, the current branch is assumed.
|
|
|
|
|
|
|
|
Examples
|
|
--------
|
|
|
|
Start development off of a known tag::
|
|
+
|
|
------------
|
|
$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6
|
|
$ cd my2.6
|
|
$ git branch my2.6.14 v2.6.14 <1>
|
|
$ git checkout my2.6.14
|
|
------------
|
|
+
|
|
<1> This step and the next one could be combined into a single step with
|
|
"checkout -b my2.6.14 v2.6.14".
|
|
|
|
Delete unneeded branch::
|
|
+
|
|
------------
|
|
$ git clone git://git.kernel.org/.../git.git my.git
|
|
$ cd my.git
|
|
$ git branch -D todo <1>
|
|
------------
|
|
+
|
|
<1> delete todo branch even if the "master" branch does not have all
|
|
commits from todo branch.
|
|
|
|
|
|
Notes
|
|
-----
|
|
|
|
If you are creating a branch that you want to immediately checkout, it's
|
|
easier to use the git checkout command with its `-b` option to create
|
|
a branch and check it out with a single command.
|
|
|
|
|
|
Author
|
|
------
|
|
Written by Linus Torvalds <torvalds@osdl.org> and Junio C Hamano <junkio@cox.net>
|
|
|
|
Documentation
|
|
--------------
|
|
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
|
|
|
GIT
|
|
---
|
|
Part of the gitlink:git[7] suite
|
|
|