Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update man page export for git-psykorebase with ronn-ng 0.9.0 #827

Merged
merged 1 commit into from
Mar 20, 2020
Merged

Update man page export for git-psykorebase with ronn-ng 0.9.0 #827

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 8 additions & 38 deletions man/git-psykorebase.1
View file
Original file line number Diff line number Diff line change
@@ -1,76 +1,46 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
.TH "GIT\-PSYKOREBASE" "1" "October 2017" "" "Git Extras"
.
.\" generated with Ronn-NG/v0.9.0
.\" http://github.com/apjanke/ronn-ng/tree/0.9.0
.TH "GIT\-PSYKOREBASE" "1" "March 2020" "" "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]
.
.P
\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 <\fIrhubscher@mozilla\.com\fR>
.
Written by Rémy Hubscher <\fI\%mailto:hubscher\.remy@gmail\.com\fR>
.P
Based on Benoît Bryon <\fIbenoit@marmelune\.net\fR> implementation in Python\.
.
Based on Benoît Bryon <\fI\%mailto:benoit@marmelune\.net\fR> implementation in Python\.
.SH "REPORTING BUGS"
<\fIhttps://github\.com/tj/git\-extras/issues\fR>
.
<\fI\%https://github\.com/tj/git\-extras/issues\fR>
.SH "SEE ALSO"
<\fIhttps://github\.com/tj/git\-extras\fR>
.
<\fI\%https://github\.com/tj/git\-extras\fR>
.P
<\fIhttps://github\.com/benoitbryon/psykorebase\fR>
<\fI\%https://github\.com/benoitbryon/psykorebase\fR>
26 changes: 13 additions & 13 deletions man/git-psykorebase.html
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/git-psykorebase.md
View file
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ Rebase the `feature_branch` on top of the `target_branch`, the

## AUTHOR

Written by Rémy Hubscher &lt;<rhubscher@mozilla.com>&gt;
Written by Rémy Hubscher &lt;<hubscher.remy@gmail.com>&gt;

Based on Benoît Bryon &lt;<benoit@marmelune.net>&gt; implementation in
Python.