git-psykorebase1
Rebase a branch with a merge commit
Usage
git-psykorebase <target_branch>
[<feature_branch>]
[--no-ff]
git-psykorebase --continue
Overview
Rebase the feature_branch on top of the target_branch, the feature_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
Releases
5 releases since Debian 9 (Stretch); the text changed 4 times.