mirror of
https://github.com/tldr-pages/tldr.git
synced 2025-07-05 21:35:22 +02:00
0e8893e1ba
Co-authored-by: Juri Dispan <juri.dispan@posteo.net> Co-authored-by: CleanMachine1 <78213164+CleanMachine1@users.noreply.github.com> Co-authored-by: Sebastiaan Speck <12570668+sebastiaanspeck@users.noreply.github.com>
17 lines
496 B
Markdown
17 lines
496 B
Markdown
# git psykorebase
|
|
|
|
> Rebase a branch on top of another using a merge commit and only one conflict handling.
|
|
> Part of `git-extras`.
|
|
> More information: <https://manned.org/git-psykorebase>.
|
|
|
|
- Rebase the current branch on top of another using a merge commit and only one conflict handling:
|
|
|
|
`git psykorebase {{upstream_branch}}`
|
|
|
|
- Continue after conflicts have been handled:
|
|
|
|
`git psykorebase --continue`
|
|
|
|
- Specify the branch to rebase:
|
|
|
|
`git psykorebase {{upstream_branch}} {{target_branch}}`
|