Add git-reup and friends

docs/man1/git-map.1

 '\" t
 .\"     Title: git-map
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 03/14/2014
+.\"      Date: 03/23/2014
 .\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools a57ed8f
+.\"    Source: depot_tools 936565b
 .\"  Language: English
 .\"
-.TH "GIT\-MAP" "1" "03/14/2014" "depot_tools a57ed8f" "Chromium depot_tools Manual"
+.TH "GIT\-MAP" "1" "03/23/2014" "depot_tools 936565b" "Chromium depot_tools Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 .\" http://bugs.debian.org/507673
 .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .\" -----------------------------------------------------------------
@@ skipping 67 matching lines @@
 .RE
 .sp
 .RS 4
 .ie n \{\
 \h'-04'\(bu\h'+03'\c
 .\}
 .el \{\
 .sp -1
 .IP \(bu 2.3
 .\}
+Merge Base markers are
+white\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 The currently checked out commit is highlighted with a
 blue background\&.
 .RE
 .sp
 The output is automatically piped through the less pager command, even on windows\&.
 .SH "OPTIONS"
 .PP
 <extra_args>\&...
 .RS 4
 Extra parameters to pass to the internal
 \fBgit-log\fR(1)
 invocation\&. This can be used to restrict what refs
 \fIgit map\fR
 operates on, etc\&.
 .sp
-If you run git map with a series of fixed arguments frequently, you can use the depot_tools\&.map_extra configuration variable to pre\-set arguments (See
+If you run git map with a series of fixed arguments frequently, you can use the depot\-tools\&.map\-extra configuration variable to pre\-set arguments (See
 CONFIGURATION VARIABLES)
 .RE
 .SH "CONFIGURATION VARIABLES"
-.SS "depot_tools\&.map_extra"
+.SS "depot\-tools\&.map\-extra"
 .sp
-Each value of the \fIdepot_tools\&.map_extra\fR config variable is applied as an additional argument to git log during the execution of git map\&. If you wish to configure this, use git config \-\-add depot_tools\&.map_extra <value> to do so\&.
+Each value of the \fIdepot\-tools\&.map\-extra\fR config variable is applied as an additional argument to git log during the execution of git map\&. If you wish to configure this, use git config \-\-add depot\-tools\&.map\-extra <value> to do so\&.
 .SH "EXAMPLE"
 .sp
 Running \fIgit map\fR would result in an output something like:
 .sp
 .if n \{\
 .RS 4
 .\}
 .nf
 \fB$ git map\fR
 *\:\fB 7dcfe47       \fR (\:\fBfrozen_changes\fR\:) 2014\-03\-12 ~ FREEZE\&.unindexed
 * \fB4b0c180\fR        2014\-03\-12 ~ modfile
 * \fB59a7cca\fR        2014\-03\-12 ~ a deleted file
-* \fB6bec695\fR        (\:origin/master\:) 2014\-03\-11 ~ Add neat feature
+* \fB6bec695\fR        (\:origin/master\:) 2014\-03\-11 ~ Add neat feature    \fB<(frozen_changes)\fR
 * \fBd15a38a\fR        2014\-03\-11 ~ Epic README update
 * \fBd559894\fR        (\:\fBmaster\fR\:) 2014\-03\-11 ~ Important upstream change
 | * \fB9c311fd\fR      (\:\fBcool_feature\fR\:) 2014\-03\-11 ~ Respond to CL comments
 | | * \fB2a1eeb2\fR    (\:\fBsubfeature\fR\:) 2014\-03\-11 ~ integrate with CoolService
 | | * \fBd777af6\fR    2014\-03\-11 ~ slick commenting action
 | |/
-| * \fB265803a\fR      2014\-03\-11 ~ another improvement
+| * \fB265803a\fR      2014\-03\-11 ~ another improvement    \fB<(subfeature)\fR
 | * \fB6d831ac\fR      (\:\fBspleen_tag\fR\:) 2014\-03\-11 ~ Refactor spleen
 | * \fB82e74ab\fR      2014\-03\-11 ~ Add widget
 |/
-* \fBd08c5b3\fR        (\:\fBbogus_noparent\fR\:) 2014\-03\-11 ~ Wonderful beginnings
+* \fBd08c5b3\fR        (\:\fBbogus_noparent\fR\:) 2014\-03\-11 ~ Wonderful beginnings    \fB<(cool_feature)\fR
 .fi
 .if n \{\
 .RE
 .\}
 .sp
 .sp
 As you can see, the structure of the commit history is visible, particularly what the parents of each commit are\&. In order to see the \fIupstream\fR relationships of the branches (i\&.e\&. which branch is tracking which other branch), use the \fBgit-map-branches\fR(1) command\&.
 .SH "SEE ALSO"
 .sp
 \fBgit-map-branches\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\&.
 .SH "NOTES"
 .IP " 1." 4
 here
 .RS 4
 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git
 .RE