Add a --keep-going flag for people who run rebase-update infrequently.

man/man1/git-rebase-update.1

 '\" t
 .\"     Title: git-rebase-update
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 04/10/2014
+.\"      Date: 09/10/2015
 .\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools 68b1017
+.\"    Source: depot_tools 805792e
 .\"  Language: English
 .\"
-.TH "GIT\-REBASE\-UPDATE" "1" "04/10/2014" "depot_tools 68b1017" "Chromium depot_tools Manual"
+.TH "GIT\-REBASE\-UPDATE" "1" "09/10/2015" "depot_tools 805792e" "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 '
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
 .ad l
 .\" -----------------------------------------------------------------
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
 git-rebase-update \- Updates all branches to have the latest changes from their upstreams\&.
 .SH "SYNOPSIS"
 .sp
 .nf
-\fIgit rebase\-update\fR [\-v | \-\-verbose] [\-n | \-\-no_fetch]
+\fIgit rebase\-update\fR [\-v | \-\-verbose] [\-n | \-\-no\-fetch] [\-k | \-\-keep\-going]
 .fi
 .sp
 .SH "DESCRIPTION"
 .sp
 Brings all branches up\-to\-date with their tracking branches\&. This involves several phases:
 .PP
 Preparation
 .RS 4
 If you currently have a branch checked out, any changes on that branch are
 \fIfrozen\fR
 (See
 \fBgit-freeze\fR(1)
 for more detail)\&. Additionally, the current branch is recorded for the
 \fIRestoration\fR
 phase later (see
 \fICONFIGURATION VARIABLES\fR
 for details on
 depot\-tools\&.rebase\-update\&.starting\-branch)\&.
 .RE
 .PP
 Fetching
 .RS 4
 All branches are examined to find their upstream references\&. The correct set of git remotes is determined, and fetched accordingly\&. Note that if any branches have a tag as their upstream, we are forced to pull all remotes\&.
 .sp
 Pass
-\-\-no_fetch
+\-\-no\-fetch
 to skip this phase\&.
 .RE
 .PP
 Rebasing
 .RS 4
 All branches are rebased in topological order from roots (upstreams) to leaves\&. Each branch is rebased from its marked merge\-base (see
 \fICONFIGURATION VARIABLES\fR) to the branch tip on top of its parent branch\&. If the parent branch is
 \fIfrozen\fR
 (see
 \fBgit-freeze\fR(1)), the branch will be rebased onto the last non\-freeze commit on the parent branch\&.
 .sp
 Things get interesting when there are merge conflicts on rebase\&. The
 \fBmost common\fR
 cause for conflicts is when your branch has been committed to the upstream in squashed form, ala
 \fBgit-squash-branch\fR(1), which is what
 \fBgit-cl\fR(1)
 and the
 \fICommit Queue\fR
 will do\&. Because of that,
 git rebase\-update
 will attempt to squash your conflicted branch to see if the squashed version applies cleanly to its upstream\&.
 .sp
 If it does not apply cleanly, then your original (non\-squashed) branch will be left in mid\-rebase and
 git rebase\-update
 will exit\&. You can deal with this like any other conflicted rebase\&. When you\(cqre done, just
 git rebase\-update
 again to pick up where you left off\&.
 .RE
+.sp
+If you\(cqd like to rebase all rebaseable branches in one pass and manually process the unrebaseable ones later, use \-k or \-\-keep\-going\&. Cleanup will not happen until all branches apply cleanly\&.
 .PP
 Cleanup
 .RS 4
 Once all the branches have been rebased, any empty branches (i\&.e\&. branches with no commits on them) are removed\&. If a branch is removed in this fashion, any branches which depend on it are reparented to the parent of the removed branch (see
 \fBgit-reparent-branch\fR(1))\&.
 .RE
 .PP
 Restoration
 .RS 4
 git rebase\-update
 checks out the branch that you started on, and
 \fIthaws\fR
 it, if necessary (see
 \fBgit-thaw\fR(1))\&. If the branch you started on got cleaned up,
 git rebase\-update
 will checkout the
 \fIroot\fR
 ref (defaults to
 \fIorigin/master\fR, as configured by
 depot\-tools\&.upstream, see
 \fBgit-new-branch\fR(1))\&.
 .RE
 .SH "OPTIONS"
 .PP
-\-n, \-\-no_fetch
+\-n, \-\-no\-fetch
 .RS 4
 Skip the
 git fetch
 phase of rebase\-update\&.
 .RE
 .PP
 \-v, \-\-verbose
 .RS 4
 More text than your terminal can handle\&.
 .RE
@@ skipping 31 matching lines @@
 \fBgit-new-branch\fR(1), \fBgit-reparent-branch\fR(1), \fBgit-rename-branch\fR(1), \fBgit-upstream-diff\fR(1), \fBgit-freeze\fR(1), \fBgit-mark-merge-base\fR(1)
 .SH "CHROMIUM DEPOT_TOOLS"
 .sp
 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
 .RS 4
 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git
 .RE