lilith/tldr
1
0
Fork 0
mirror of https://github.com/tldr-pages/tldr.git synced 2025-06-09 05:06:00 +02:00
Code Activity
tldr/pages/common/git-psykorebase.md
Managor 0e8893e1ba
git*: refresh pages (#16372) 
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>
2025-05-05 09:12:13 +03:00

496 B
Raw Blame History

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}}