| Index: docs/man1/git-map-branches.1
|
| diff --git a/docs/man1/git-map-branches.1 b/docs/man1/git-map-branches.1
|
| index 7d1c5b3cfbc37f9029845a70daf332e7e87e6f0e..857825327a7d1c48bb286905c8b2ab3e68547d3e 100644
|
| --- a/docs/man1/git-map-branches.1
|
| +++ b/docs/man1/git-map-branches.1
|
| @@ -2,12 +2,12 @@
|
| .\" Title: git-map-branches
|
| .\" 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\-MAP\-BRANCHES" "1" "03/25/2014" "depot_tools 207bff1" "Chromium depot_tools Manual"
|
| +.TH "GIT\-MAP\-BRANCHES" "1" "04/10/2014" "depot_tools 68b1017" "Chromium depot_tools Manual"
|
| .\" -----------------------------------------------------------------
|
| .\" * Define some portability stuff
|
| .\" -----------------------------------------------------------------
|
| @@ -130,6 +130,8 @@ If multiple branches are on the same commit, they will all be cyan\&.
|
| .sp
|
| Given the hypothetical demo repo in \fBgit-map\fR(1)\*(Aqs EXAMPLE section, and assuming that the frozen_changes branch was currently checked out, running \fIgit map\-branches\fR would result in an output like:
|
| .sp
|
| +
|
| +.sp
|
| .if n \{\
|
| .RS 4
|
| .\}
|
| @@ -138,11 +140,10 @@ Given the hypothetical demo repo in \fBgit-map\fR(1)\*(Aqs EXAMPLE section, and
|
| origin/master
|
| cool_feature
|
| subfeature
|
| - frozen_changes *
|
| - master
|
| -{NO UPSTREAM}
|
| - bogus_noparent
|
| - duplicate_cool_feature_no_upstream
|
| + fixit
|
| +\fB frozen_branch *
|
| +\fR{NO UPSTREAM}
|
| + no_upstream
|
| .fi
|
| .if n \{\
|
| .RE
|
| @@ -168,7 +169,7 @@ Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitcon
|
| \fBgit-map\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
|
|
|