| OLD | NEW |
|---|
| 1 git-rebase-update(1) | 1 git-rebase-update(1) |
| 2 ==================== | 2 ==================== |
| 3 | 3 |
| 4 NAME | 4 NAME |
| 5 ---- | 5 ---- |
| 6 git-rebase-update - | 6 git-rebase-update - |
| 7 include::_git-rebase-update_desc.helper.txt[] | 7 include::_git-rebase-update_desc.helper.txt[] |
| 8 | 8 |
| 9 SYNOPSIS | 9 SYNOPSIS |
| 10 -------- | 10 -------- |
| 11 [verse] | 11 [verse] |
| 12 'git rebase-update' [-v | --verbose] [-n | --no-fetch] | 12 'git rebase-update' [-v | --verbose] [-n | --no-fetch] [-k | --keep-going] |
| 13 | 13 |
| 14 DESCRIPTION | 14 DESCRIPTION |
| 15 ----------- | 15 ----------- |
| 16 | 16 |
| 17 Brings all branches up-to-date with their tracking branches. This involves | 17 Brings all branches up-to-date with their tracking branches. This involves |
| 18 several phases: | 18 several phases: |
| 19 | 19 |
| 20 Preparation:: | 20 Preparation:: |
| 21 If you currently have a branch checked out, any changes on that branch are | 21 If you currently have a branch checked out, any changes on that branch are |
| 22 'frozen' (See linkgit:git-freeze[1] for more detail). Additionally, the curren
t | 22 'frozen' (See linkgit:git-freeze[1] for more detail). Additionally, the curren
t |
| (...skipping 19 matching lines...) Expand all Loading... |
| 42 upstream in squashed form, ala linkgit:git-squash-branch[1], which is what | 42 upstream in squashed form, ala linkgit:git-squash-branch[1], which is what |
| 43 linkgit:git-cl[1] and the 'Commit Queue' will do. Because of that, `git | 43 linkgit:git-cl[1] and the 'Commit Queue' will do. Because of that, `git |
| 44 rebase-update` will attempt to squash your conflicted branch to see if the | 44 rebase-update` will attempt to squash your conflicted branch to see if the |
| 45 squashed version applies cleanly to its upstream. | 45 squashed version applies cleanly to its upstream. |
| 46 + | 46 + |
| 47 If it does not apply cleanly, then your original (non-squashed) branch will be | 47 If it does not apply cleanly, then your original (non-squashed) branch will be |
| 48 left in mid-rebase and `git rebase-update` will exit. You can deal with this | 48 left in mid-rebase and `git rebase-update` will exit. You can deal with this |
| 49 like any other conflicted rebase. When you're done, just `git rebase-update` | 49 like any other conflicted rebase. When you're done, just `git rebase-update` |
| 50 again to pick up where you left off. | 50 again to pick up where you left off. |
| 51 | 51 |
| 52 If you'd like to rebase all rebaseable branches in one pass and manually process |
| 53 the unrebaseable ones later, use -k or --keep-going. Cleanup will not happen |
| 54 until all branches apply cleanly. |
| 55 |
| 52 Cleanup:: | 56 Cleanup:: |
| 53 Once all the branches have been rebased, any empty branches (i.e. branches | 57 Once all the branches have been rebased, any empty branches (i.e. branches |
| 54 with no commits on them) are removed. If a branch is removed in this fashion, | 58 with no commits on them) are removed. If a branch is removed in this fashion, |
| 55 any branches which depend on it are reparented to the parent of the removed | 59 any branches which depend on it are reparented to the parent of the removed |
| 56 branch (see linkgit:git-reparent-branch[1]). | 60 branch (see linkgit:git-reparent-branch[1]). |
| 57 | 61 |
| 58 Restoration:: | 62 Restoration:: |
| 59 `git rebase-update` checks out the branch that you started on, and 'thaws' it, | 63 `git rebase-update` checks out the branch that you started on, and 'thaws' it, |
| 60 if necessary (see linkgit:git-thaw[1]). If the branch you started on got | 64 if necessary (see linkgit:git-thaw[1]). If the branch you started on got |
| 61 cleaned up, `git rebase-update` will checkout the 'root' ref (defaults to | 65 cleaned up, `git rebase-update` will checkout the 'root' ref (defaults to |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 | 125 |
| 122 SEE ALSO | 126 SEE ALSO |
| 123 -------- | 127 -------- |
| 124 linkgit:git-new-branch[1], linkgit:git-reparent-branch[1], | 128 linkgit:git-new-branch[1], linkgit:git-reparent-branch[1], |
| 125 linkgit:git-rename-branch[1], linkgit:git-upstream-diff[1], | 129 linkgit:git-rename-branch[1], linkgit:git-upstream-diff[1], |
| 126 linkgit:git-freeze[1], linkgit:git-mark-merge-base[1] | 130 linkgit:git-freeze[1], linkgit:git-mark-merge-base[1] |
| 127 | 131 |
| 128 include::_footer.txt[] | 132 include::_footer.txt[] |
| 129 | 133 |
| 130 // vim: ft=asciidoc: | 134 // vim: ft=asciidoc: |
| OLD | NEW |
|---|
Chromium Code Reviews
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