diff --git a/man/git-psykorebase.1 b/man/git-psykorebase.1 index 4eb81a2..584a7ce 100644 --- a/man/git-psykorebase.1 +++ b/man/git-psykorebase.1 @@ -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 [] [\-\-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> diff --git a/man/git-psykorebase.html b/man/git-psykorebase.html index e69ae64..3d4dcb9 100644 --- a/man/git-psykorebase.html +++ b/man/git-psykorebase.html @@ -1,8 +1,8 @@ - - + + git-psykorebase(1) - Rebase a branch with a merge commit