1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
.\" generated with Ronn-NG/v0.9.1
.\" http://github.com/apjanke/ronn-ng/tree/0.9.1
.TH "GIT\-PSYKOREBASE" "1" "August 2021" "" "Git Extras"
.SH "NAME"
\fBgit\-psykorebase\fR \- Rebase a branch with a merge commit
.SH "SYNOPSIS"
\fBgit\-psykorebase\fR <target_branch> [<feature_branch>] [\-\-no\-ff]
.br
\fBgit\-psykorebase\fR \-\-continue
.SH "DESCRIPTION"
Rebase the \fBfeature_branch\fR on top of the \fBtarget_branch\fR, the \fBfeature_branch\fR defaults to the current one\.
.SH "OPTIONS"
\fB\-\-no\-ff\fR Force a commit message even if there are no conflicts\.
.P
\fB\-\-continue\fR Continue the rebase after conflicts have been resolved\.
.SH "EXAMPLES"
Rebase current branch on top of master:
.IP "" 4
.nf
$ git psykorebase master \-\-no\-ff
.fi
.IP "" 0
.P
Handle conflicts:
.IP "" 4
.nf
$ git add README\.md
.fi
.IP "" 0
.P
Continue rebase:
.IP "" 4
.nf
$ git psykorebase \-\-continue
.fi
.IP "" 0
.SH "AUTHOR"
Written by Rémy Hubscher <\fIhubscher\.remy@gmail\.com\fR>
.P
Based on Benoît Bryon <\fIbenoit@marmelune\.net\fR> implementation in Python\.
.SH "REPORTING BUGS"
<\fIhttps://github\.com/tj/git\-extras/issues\fR>
.SH "SEE ALSO"
<\fIhttps://github\.com/tj/git\-extras\fR>
.P
<\fIhttps://github\.com/benoitbryon/psykorebase\fR>
|
