extra-git/man/psykorebase.txt

Common utility commands for Git repositories.

git-psykorebase(1) -- Rebase a branch with a merge commit

SYNOPSIS

git-psykorebase <targetbranch> [<featurebranch>] [--no-ff]
git-psykorebase --continue

DESCRIPTION

Rebase the featurebranch on top of the targetbranch, 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 <>

Based on Benoît Bryon <> implementation in
Python.

REPORTING BUGS

<>

SEE ALSO

<>

<>