git-psykorebase man page

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 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

Author

Written by Rémy Hubscher <rhubscher@mozilla.com>

Based on Benoît 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/psykoreb…>

Referenced By

git-extras(1).

December 2015