X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-branch.html;h=f835657dd660ab6c5c69963404f51df97918915b;hb=8db10ef151a381c2c5cbaaba7da8ba3b63d0ca75;hp=20e8847d82475537adc9858f988216fc081e709c;hpb=560a1f6414df207911062a54e3f8a6c0f0721195;p=git.git

diff --git a/git-branch.html b/git-branch.html
index 20e8847d..f835657d 100644
--- a/git-branch.html
+++ b/git-branch.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 7.0.1" />
+<meta name="generator" content="AsciiDoc 7.0.2" />
 <style type="text/css">
 /* Debug borders */
 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -266,20 +266,28 @@ git-branch(1) Manual Page
 <h2>NAME</h2>
 <div class="sectionbody">
 <p>git-branch -
-   Create a new branch, or remove an old one.
+   List, create, or delete branches.
 </p>
 </div>
 </div>
 <h2>SYNOPSIS</h2>
 <div class="sectionbody">
-<p><em>git-branch</em> [(-d | -D) &lt;branchname&gt;] | [[-f] &lt;branchname&gt; [&lt;start-point&gt;]]</p>
+<div class="verseblock">
+<div class="content"><em>git-branch</em> [-r]
+<em>git-branch</em> [-l] [-f] &lt;branchname&gt; [&lt;start-point&gt;]
+<em>git-branch</em> (-d | -D) &lt;branchname&gt;&#8230;</div></div>
 </div>
 <h2>DESCRIPTION</h2>
 <div class="sectionbody">
-<p>If no argument is provided, show available branches and mark current
-branch with star. Otherwise, create a new branch of name &lt;branchname&gt;.</p>
-<p>If a starting point is also specified, that will be where the branch is
-created, otherwise it will be created at the current HEAD.</p>
+<p>With no arguments given (or just <tt>-r</tt>) a list of available branches
+will be shown, the current branch will be highlighted with an asterisk.</p>
+<p>In its second form, a new branch named &lt;branchname&gt; will be created.
+It will start out with a head equal to the one given as &lt;start-point&gt;.
+If no &lt;start-point&gt; is given, the branch will be created with a head
+equal to that of the currently checked out branch.</p>
+<p>With a <tt>-d</tt> or <tt>-D</tt> option, <tt>&lt;branchname&gt;</tt> 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.</p>
 </div>
 <h2>OPTIONS</h2>
 <div class="sectionbody">
@@ -301,11 +309,29 @@ created, otherwise it will be created at the current HEAD.</p>
 </p>
 </dd>
 <dt>
+-l
+</dt>
+<dd>
+<p>
+        Create the branch's ref log.  This activates recording of
+        all changes to made the branch ref, enabling use of date
+</p>
+</dd>
+<dt>
 -f
 </dt>
 <dd>
 <p>
-        Force a reset of &lt;branchname&gt; to &lt;start-point&gt; (or current head).
+        Force the creation of a new branch even if it means deleting
+        a branch that already exists with the same name.
+</p>
+</dd>
+<dt>
+-r
+</dt>
+<dd>
+<p>
+        List only the "remote" branches.
 </p>
 </dd>
 <dt>
@@ -314,6 +340,9 @@ created, otherwise it will be created at the current HEAD.</p>
 <dd>
 <p>
         The name of the branch to create or delete.
+        The new branch name must pass all checks defined by
+        <a href="git-check-ref-format.html">git-check-ref-format(1)</a>.  Some of these checks
+        may restrict the characters allowed in a branch name.
 </p>
 </dd>
 <dt>
@@ -321,26 +350,35 @@ created, otherwise it will be created at the current HEAD.</p>
 </dt>
 <dd>
 <p>
-        Where to create the branch; defaults to HEAD. This
-        option has no meaning with -d and -D.
+        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.
 </p>
 </dd>
 </dl>
-<h3>Examples</h3>
+</div>
+<h2>Examples</h2>
+<div class="sectionbody">
 <dl>
 <dt>
-Start development off of a know tag
+Start development off of a known tag
 </dt>
 <dd>
 <div class="listingblock">
 <div class="content">
 <pre><tt>$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6
 $ cd my2.6
-$ git branch my2.6.14 v2.6.14 <b>(1)</b>
-$ git checkout my2.6.14
-
-<b>(1)</b> These two steps are the same as "checkout -b my2.6.14 v2.6.14".</tt></pre>
+$ git branch my2.6.14 v2.6.14   <b>(1)</b>
+$ git checkout my2.6.14</tt></pre>
 </div></div>
+<ol>
+<li>
+<p>
+This step and the next one could be combined into a single step with
+"checkout -b my2.6.14 v2.6.14".
+</p>
+</li>
+</ol>
 </dd>
 <dt>
 Delete unneeded branch
@@ -350,14 +388,25 @@ Delete unneeded branch
 <div class="content">
 <pre><tt>$ git clone git://git.kernel.org/.../git.git my.git
 $ cd my.git
-$ git branch -D todo <b>(1)</b>
-
-<b>(1)</b> delete todo branch even if the "master" branch does not have all
-commits from todo branch.</tt></pre>
+$ git branch -D todo    <b>(1)</b></tt></pre>
 </div></div>
+<ol>
+<li>
+<p>
+delete todo branch even if the "master" branch does not have all
+commits from todo branch.
+</p>
+</li>
+</ol>
 </dd>
 </dl>
 </div>
+<h2>Notes</h2>
+<div class="sectionbody">
+<p>If you are creating a branch that you want to immediately checkout, it's
+easier to use the git checkout command with its <tt>-b</tt> option to create
+a branch and check it out with a single command.</p>
+</div>
 <h2>Author</h2>
 <div class="sectionbody">
 <p>Written by Linus Torvalds &lt;torvalds@osdl.org&gt; and Junio C Hamano &lt;junkio@cox.net&gt;</p>
@@ -372,7 +421,7 @@ commits from todo branch.</tt></pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 29-Jan-2006 20:18:17 PDT
+Last updated 04-Jun-2006 07:24:21 UTC
 </div>
 </div>
 </body>
