GSP
Quick Navigator

Search Site

Unix VPS
A - Starter
B - Basic
C - Preferred
D - Commercial
MPS - Dedicated
Previous VPSs
* Sign Up! *

Support
Contact Us
Online Help
Handbooks
Domain Status
Man Pages

FAQ
Virtual Servers
Pricing
Billing
Technical

Network
Facilities
Connectivity
Topology Map

Miscellaneous
Server Agreement
Year 2038
Credits
 

USA Flag

 

 

Man Pages


Manual Reference Pages  -  GIT-PSYKOREBASE (1)

NAME

git-psykorebase - Rebase a branch with a merge commit

CONTENTS

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

Search for    or go to Top of page |  Section 1 |  Main Index


GIT-PSYKOREBASE (1) December 2015

Powered by GSP Visit the GSP FreeBSD Man Page Interface.
Output converted with manServer 1.07.