Add git-reup and friends

docs/man1/git-mark-merge-base.1

Index: docs/man1/git-mark-merge-base.1
diff --git a/docs/man1/git-nav-downstream.1 b/docs/man1/git-mark-merge-base.1
similarity index 56%
copy from docs/man1/git-nav-downstream.1
copy to docs/man1/git-mark-merge-base.1
index de000e21e22b57de50a2cf4bd237076aac7194a3..288a8821e7bef3bf9cd38d992d037a153f71cd51 100644
--- a/docs/man1/git-nav-downstream.1
+++ b/docs/man1/git-mark-merge-base.1
@@ -1,13 +1,13 @@
 '\" t
-.\"     Title: git-nav-downstream
+.\"     Title: git-mark-merge-base
 .\"    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/25/2014
 .\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools a57ed8f
+.\"    Source: depot_tools 207bff1
 .\"  Language: English
 .\"
-.TH "GIT\-NAV\-DOWNSTREAM" "1" "03/14/2014" "depot_tools a57ed8f" "Chromium depot_tools Manual"
+.TH "GIT\-MARK\-MERGE\-BA" "1" "03/25/2014" "depot_tools 207bff1" "Chromium depot_tools Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -28,53 +28,36 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-git-nav-downstream \- Checkout a downstream branch of the currently checked out branch\&.
+git-mark-merge-base \- Manually interact with depot_tools\*(Aq merge\-base markers\&.
 .SH "SYNOPSIS"
 .sp
 .nf
-\fIgit nav\-downstream\fR
+\fIgit mark\-merge\-base\fR
+\fIgit mark\-merge\-base\fR <commit hash>
+\fIgit mark\-merge\-base\fR [\-d | \-\-delete]
 .fi
 .sp
 .SH "DESCRIPTION"
 .sp
-\fIgit\-nav\-downstream\fR takes the current branch and discovers all branches downstream of it\&. If there is only one branch downstream of the current branch, the command will check that out\&. If there\*(Aqs more than one downstream branch, the command will prompt you with a selection of the branches\&.
-.SH "EXAMPLE"
+Inspect, set or delete the current merge\-base marker for the current branch\&. This should not be needed, but is useful if things get into a snarled state\&. Pass no arguments to view the current value\&. If you provide <commit hash>, then git mark\-merge\-base will attempt to set that as the merge\-base value\&.
 .sp
-.if n \{\
+It is invalid to pick a commit which is not an ancestor of the current branch\&.
+.sp
+See \fBgit-rebase-update\fR(1)\*(Aqs description of the branch\&.<name>\&.base configuration variable for more info on what the merge base markers are for\&.
+.SH "OPTIONS"
+.PP
+\-d, \-\-delete
 .RS 4
-.\}
-.nf
-\fB$ git map\-branches\fR
-\fBorigin/master *\:\fR
-  cool_feature
-    subfeature
-  frozen_changes
-  master
-{NO UPSTREAM}
-  bogus_noparent
-\fB$ git nav\-downstream\fR
-
-Please select a downstream branch
-  0\&. cool_feature
-  1\&. frozen_changes
-  2\&. master
-Selection (0\-2)[0]: 0
-\fB$ git map\-branches\fR
-origin/master
-  \fBcool_feature *\:\fR
-    subfeature
-  frozen_changes
-  master
-{NO UPSTREAM}
-  bogus_noparent
-.fi
-.if n \{\
+Delete the merge\-base marker for the current branch\&.
+.RE
+.PP
+<commit hash>
+.RS 4
+The new value to set for the current branch\(cqs merge\-base marker\&.
 .RE
-.\}
-.sp
 .SH "SEE ALSO"
 .sp
-\fBgit-map-branches\fR(1), \fBgit-nav-upstream\fR(1)
+\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\&.