ivuorinen/cheatsheet-tldr
1
0
Fork 0
mirror of https://github.com/ivuorinen/cheatsheet-tldr.git synced 2026-02-18 14:49:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move pages under tldr, lint run.sh, update docs

Browse Source
This commit is contained in:
Ismo Vuorinen
2024-02-21 13:58:43 +02:00
parent 3d653cc7e6
commit 2c475fa62d
4806 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tldr/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}}`