| GIT-PSYKOREBASE(1) | Git Extras | GIT-PSYKOREBASE(1) |
git-psykorebase - Rebase a branch with a merge commit
git-psykorebase <target_branch> [<feature_branch>] [--no-ff]
git-psykorebase --continue
Rebase the feature_branch on top of the target_branch, the feature_branch defaults to the current one.
--no-ff Force a commit message even if there are no conflicts.
--continue Continue the rebase after conflicts have been resolved.
Rebase current branch on top of master:
$ git psykorebase master --no-ff
Handle conflicts:
$ git add README.md
Continue rebase:
$ git psykorebase --continue
Written by Remy Hubscher <rhubscher@mozilla.com>
Based on Benoit Bryon <benoit@marmelune.net> implementation in Python.
<https://github.com/tj/git-extras/issues>
<https://github.com/tj/git-extras>
<https://github.com/benoitbryon/psykorebase>
| September 2018 |