diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2006-12-13 21:32:17 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2006-12-13 21:32:17 +0000 |
commit | e7935c49199b7d60c02043382b62ce70d36017e9 (patch) | |
tree | 280d09d89444d318008e632fbb9c9d88a393cacf /git-branch.html | |
parent | 3f403b04bd95096f37297ab2cfbd4ad1f6dbb904 (diff) | |
download | git-htmldocs-e7935c49199b7d60c02043382b62ce70d36017e9.tar.gz |
Autogenerated HTML docs for v1.4.4.2-g1d77
Diffstat (limited to 'git-branch.html')
-rw-r--r-- | git-branch.html | 45 |
1 files changed, 42 insertions, 3 deletions
diff --git a/git-branch.html b/git-branch.html index 486778935..74a4e26d1 100644 --- a/git-branch.html +++ b/git-branch.html @@ -273,8 +273,9 @@ git-branch(1) Manual Page <h2>SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="content"><em>git-branch</em> [-r] [-a] [-v] [--abbrev=<length>]
+<div class="content"><em>git-branch</em> [-r | -a] [-v [--abbrev=<length>]]
<em>git-branch</em> [-l] [-f] <branchname> [<start-point>]
+<em>git-branch</em> (-m | -M) [<oldbranch>] <newbranch>
<em>git-branch</em> (-d | -D) <branchname>…</div></div>
</div>
<h2>DESCRIPTION</h2>
@@ -287,6 +288,11 @@ and option <tt>-a</tt> shows both.</p> 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.</p>
+<p>With a <em>-m</em> or <em>-M</em> option, <oldbranch> will be renamed to <newbranch>.
+If <oldbranch> had a corresponding reflog, it is renamed to match
+<newbranch>, and a reflog entry is created to remember the branch
+renaming. If <newbranch> exists, -M must be used to force the rename
+to happen.</p>
<p>With a <tt>-d</tt> or <tt>-D</tt> option, <tt><branchname></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>
@@ -329,6 +335,22 @@ has a ref log then the ref log will also be deleted.</p> </p>
</dd>
<dt>
+-m
+</dt>
+<dd>
+<p>
+ Move/rename a branch and the corresponding reflog.
+</p>
+</dd>
+<dt>
+-M
+</dt>
+<dd>
+<p>
+ Move/rename a branch even if the new branchname already exists.
+</p>
+</dd>
+<dt>
-r
</dt>
<dd>
@@ -349,7 +371,7 @@ has a ref log then the ref log will also be deleted.</p> </dt>
<dd>
<p>
- Show sha1 and subject message for each head.
+ Show sha1 and commit subjectline for each head.
</p>
</dd>
<dt>
@@ -382,6 +404,23 @@ has a ref log then the ref log will also be deleted.</p> is omitted, the current branch is assumed.
</p>
</dd>
+<dt>
+<oldbranch>
+</dt>
+<dd>
+<p>
+ The name of an existing branch to rename.
+</p>
+</dd>
+<dt>
+<newbranch>
+</dt>
+<dd>
+<p>
+ The new name for an existing branch. The same restrictions as for
+ <branchname> applies.
+</p>
+</dd>
</dl>
</div>
<h2>Examples</h2>
@@ -448,7 +487,7 @@ a branch and check it out with a single command.</p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 25-Nov-2006 10:05:14 UTC
+Last updated 13-Dec-2006 21:32:04 UTC
</div>
</div>
</body>
|