lilith/tldr
1
0
Fork 0
mirror of https://github.com/tldr-pages/tldr.git synced 2025-07-23 02:35:25 +02:00
Code Activity

git-psykorebase: add page (#10994)

Browse source
This commit is contained in:
Sebastiaan Speck 2023-10-16 09:22:43 +02:00 • committed by GitHub
parent 8624161f8d
commit fde67e7204
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pages/common/git-psykorebase.md Normal file
View file

@ -0,0 +1,17 @@
# 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}}`