This reverts commit 4497535246
.
This commit is contained in:

committed by
GitHub

parent
50f42a99eb
commit
be3998d964
@@ -4,9 +4,9 @@
|
||||
> Commonly used to "move" an entire branch to another base, creating copies of the commits in the new location.
|
||||
> More information: <https://git-scm.com/docs/git-rebase>.
|
||||
|
||||
- Rebase the current branch on top of the main branch:
|
||||
- Rebase the current branch on top of the master branch:
|
||||
|
||||
`git rebase {{main}}`
|
||||
`git rebase {{master}}`
|
||||
|
||||
- Start an interactive rebase, which allows the commits to be reordered, omitted, combined or modified:
|
||||
|
||||
@@ -34,4 +34,4 @@
|
||||
|
||||
- Auto-resolve any conflicts by favoring the working branch version (`theirs` keyword has reversed meaning in this case):
|
||||
|
||||
`git rebase -X theirs {{main}}`
|
||||
`git rebase -X theirs {{master}}`
|
||||
|
Reference in New Issue
Block a user