Index: docs/man1/git-new-branch.1 |
diff --git a/docs/man1/git-new-branch.1 b/docs/man1/git-new-branch.1 |
index e0866e17082cf16f074d3784f8745fcdfaf45989..f36371e10feb1ad54554411adcd2863c15cf11ad 100644 |
--- a/docs/man1/git-new-branch.1 |
+++ b/docs/man1/git-new-branch.1 |
@@ -2,12 +2,12 @@ |
.\" Title: git-new-branch |
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> |
-.\" Date: 03/25/2014 |
+.\" Date: 04/10/2014 |
.\" Manual: Chromium depot_tools Manual |
-.\" Source: depot_tools 207bff1 |
+.\" Source: depot_tools 68b1017 |
.\" Language: English |
.\" |
-.TH "GIT\-NEW\-BRANCH" "1" "03/25/2014" "depot_tools 207bff1" "Chromium depot_tools Manual" |
+.TH "GIT\-NEW\-BRANCH" "1" "04/10/2014" "depot_tools 68b1017" "Chromium depot_tools Manual" |
.\" ----------------------------------------------------------------- |
.\" * Define some portability stuff |
.\" ----------------------------------------------------------------- |
@@ -71,6 +71,8 @@ The name for the new branch\&. |
This configures the default \fIupstream\fR for all new branches\&. If it is unset, it defaults to \fIorigin/master\fR\&. This is considered to be the \fIroot\fR branch\&. |
.SH "EXAMPLE" |
.sp |
+ |
+.sp |
.if n \{\ |
.RS 4 |
.\} |
@@ -79,44 +81,59 @@ This configures the default \fIupstream\fR for all new branches\&. If it is unse |
origin/master |
cool_feature |
subfeature |
- frozen_changes * |
-\fB$ git new\-branch independent_cl\fR |
+ fixit |
+\fB frozen_branch * |
+$ git new\-branch independent_cl\fR |
\fB$ git map\-branches\fR |
-origin/master |
- cool_feature |
+\fBorigin/master |
+\fR cool_feature |
subfeature |
- frozen_changes |
- independent_cl * |
-\fB$ git new\-branch \-\-upstream subfeature nested_cl\fR |
+ fixit |
+ frozen_branch |
+\fB independent_cl * |
+$ git new\-branch \-\-upstream subfeature nested_cl\fR |
\fB$ git map\-branches\fR |
origin/master |
cool_feature |
- subfeature \fB(1)\fR |
+\fB subfeature \fR\fB\fB(1)\fR\fR\fB |
nested_cl * |
- frozen_changes |
+\fR fixit |
+ frozen_branch |
independent_cl |
\fB$ git checkout cool_feature\fR |
+Your branch is ahead of \*(Aqorigin/master\*(Aq by 4 commits\&. |
+ (use "git push" to publish your local commits) |
\fB$ git new\-branch \-\-upstream_current cl_depends_on_cool_feature\fR |
\fB$ git map\-branches\fR |
origin/master |
- cool_feature |
+\fB cool_feature |
cl_depends_on_cool_feature * |
- subfeature |
+\fR subfeature |
nested_cl |
- frozen_changes |
+ fixit |
+ frozen_branch |
independent_cl |
.fi |
.if n \{\ |
.RE |
.\} |
.sp |
+ |
.sp |
-\fB1. \fRNote that both branches are cyan because they are currently the same |
+.RS 4 |
+.ie n \{\ |
+\h'-04' 1.\h'+01'\c |
+.\} |
+.el \{\ |
+.sp -1 |
+.IP " 1." 4.2 |
+.\} |
+Note that both branches are cyan because they are currently the same |
\fIcommit\fR |
object\&. See |
-\fB:git-map-branches\fR(1) |
+\fBgit-map-branches\fR(1) |
for more detail\&. |
-.br |
+.RE |
.SH "SUGGESTED ALIASES" |
.sp |
Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitconfig\fR file\&. |
@@ -141,7 +158,7 @@ Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitcon |
\fBgit-rebase-update\fR(1), \fBgit-reparent-branch\fR(1), \fBgit-rename-branch\fR(1), \fBgit-upstream-diff\fR(1) |
.SH "CHROMIUM DEPOT_TOOLS" |
.sp |
-Part of the chromium \fBdepot_tools\fR(1) suite\&. These tools are meant to assist with the development of chromium and related projects\&. Download the tools from \m[blue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&. |
+Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assist with the development of chromium and related projects\&. Download the tools from \m[blue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&. |
.SH "NOTES" |
.IP " 1." 4 |
here |