Man page - git-psykorebase(1)
Packages contains this manual
- git-unlock(1)
- git-browse(1)
- git-standup(1)
- git-alias(1)
- git-setup(1)
- git-abort(1)
- git-rename-tag(1)
- git-lock(1)
- git-scp(1)
- git-repl(1)
- git-fresh-branch(1)
- git-touch(1)
- git-delta(1)
- git-force-clone(1)
- git-gh-pages(1)
- git-release(1)
- git-info(1)
- git-delete-squashed-branches(1)
- git-archive-file(1)
- git-get(1)
- git-rebase-patch(1)
- git-delete-tag(1)
- git-clear-soft(1)
- git-count(1)
- git-root(1)
- git-pull-request(1)
- git-local-commits(1)
- git-pr(1)
- git-ignore(1)
- git-cp(1)
- git-show-merged-branches(1)
- git-feature(1)
- git-sed(1)
- git-effort(1)
- git-utimes(1)
- git-show-tree(1)
- git-reauthor(1)
- git-authors(1)
- git-commits-since(1)
- git-changelog(1)
- git-delete-branch(1)
- git-fork(1)
- git-squash(1)
- git-magic(1)
- git-summary(1)
- git-rename-remote(1)
- git-ignore-io(1)
- git-show-unmerged-branches(1)
- git-locked(1)
- git-missing(1)
- git-undo(1)
- git-clear(1)
- git-obliterate(1)
- git-reset-file(1)
- git-guilt(1)
- git-bulk(1)
- git-merge-repo(1)
- git-rename-file(1)
- git-contrib(1)
- git-stamp(1)
- git-extras(1)
- git-delete-merged-branches(1)
- git-browse-ci(1)
- git-merge-into(1)
- git-graft(1)
- git-rename-branch(1)
- git-create-branch(1)
- git-sync(1)
- git-delete-submodule(1)
- git-coauthor(1)
- git-psykorebase(1)
- git-brv(1)
- git-paste(1)
- git-mr(1)
apt-get install git-extras
Manual
GIT-PSYKOREBASE
NAMESYNOPSIS
DESCRIPTION
OPTIONS
EXAMPLES
AUTHOR
REPORTING BUGS
SEE ALSO
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 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 < hubscher.remy@gmail.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/psykorebase >