Update cheatsheets

This commit is contained in:
ivuorinen
2024-02-21 11:19:49 +00:00
parent 4e88a1b42f
commit 3d653cc7e6
4803 changed files with 127002 additions and 0 deletions

22
git-psykorebase Normal file
View File

@@ -0,0 +1,22 @@
---
syntax: markdown
tags: [tldr, common]
source: https://github.com/tldr-pages/tldr.git
---
# 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://github.com/tj/git-extras/blob/master/Commands.md#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}}`