Chromium Code Reviews| 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..87513fe932057588e04c623dd41bc77968240e60 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 |
|
iannucci
2015/09/10 23:33:42
do you mean `-k`?
ghost stip (do not use)
2015/09/10 23:44:37
indeed!
|
| +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, |