FreeBSD Manual Pages
GIT-PSYKOREBASE(1) Git Extras GIT-PSYKOREBASE(1) NAME git-psykorebase - Rebase a branch with a merge commit SYNOPSIS git-psykorebase <target_branch> [<feature_branch>] [--no-ff] git-psykorebase --continue DESCRIPTION Rebase the feature_branch on top of the target_branch, the fea- ture_branch defaults to the current one. OPTIONS --no-ff Force a commit message even if there are no conflicts. --continue Continue the rebase after conflicts have been resolved. EXAMPLES Rebase current branch on top of master: $ git psykorebase master --no-ff Handle conflicts: $ git add README.md Continue rebase: $ git psykorebase --continue AUTHOR Written by Rmy Hubscher <hubscher.remy@gmail.com> Based on Benot Bryon <benoit@marmelune.net> implementation in Python. REPORTING BUGS <https://github.com/tj/git-extras/issues> SEE ALSO <https://github.com/tj/git-extras> <https://github.com/benoitbryon/psykorebase> August 2021 GIT-PSYKOREBASE(1)
NAME | SYNOPSIS | DESCRIPTION | OPTIONS | EXAMPLES | AUTHOR | REPORTING BUGS | SEE ALSO
Want to link to this manual page? Use this URL:
<https://man.freebsd.org/cgi/man.cgi?query=git-psykorebase&sektion=1&manpath=FreeBSD+Ports+14.3.quarterly>