man/src/git-rebase-update.txt - Issue 1331263002: Add a --keep-going flag for people who run rebase-update infrequently.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: man/src/git-rebase-update.txt

Issue 1331263002: Add a --keep-going flag for people who run rebase-update infrequently. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master

Patch Set: Fix typo. Created 5 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: man/src/git-rebase-update.txt

diff --git a/man/src/git-rebase-update.txt b/man/src/git-rebase-update.txt

index 6f8e0316b33393cf58dde7e3120a370a68263c0a..22fe4ebed7f6faa16096231eec2b1d2e76fa5734 100644

--- a/man/src/git-rebase-update.txt

+++ b/man/src/git-rebase-update.txt

@@ -9,7 +9,7 @@ include::_git-rebase-update_desc.helper.txt[]

SYNOPSIS

--------

[verse]

-'git rebase-update' [-v | --verbose] [-n | --no-fetch]

+'git rebase-update' [-v | --verbose] [-n | --no-fetch] [-k | --keep-going]

DESCRIPTION

-----------

@@ -49,6 +49,10 @@ left in mid-rebase and `git rebase-update` will exit. You can deal with this

like any other conflicted rebase. When you're done, just `git rebase-update`

again to pick up where you left off.

+If you'd 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.

Cleanup::

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,

« no previous file with comments | « man/man1/git-rebase-update.1 ('k') | tests/git_rebase_update_test.py » ('j') | no next file with comments »