Skip site navigation (1)Skip section navigation (2)

FreeBSD Manual Pages

  
 
  

home | help
GIT-PSYKOREBASE(1)		  Git Extras		    GIT-PSYKOREBASE(1)

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 fea-
       ture_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 RA(C)my Hubscher <mailto:hubscher.remy@gmail.com>

       Based on	BenoA(R)t Bryon	 <mailto: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>

				  March	2020		    GIT-PSYKOREBASE(1)

NAME | SYNOPSIS | DESCRIPTION | OPTIONS | EXAMPLES | AUTHOR | REPORTING BUGS | SEE ALSO

Want to link to this manual page? Use this URL:
<https://www.freebsd.org/cgi/man.cgi?query=git-psykorebase&sektion=1&manpath=FreeBSD+12.1-RELEASE+and+Ports>

home | help