From fa4c5dd456092f1db6b120d3ef267bc6061edfdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20HUBSCHER?= Date: Tue, 11 Aug 2015 11:30:36 +0200 Subject: [PATCH] Improve man page presentation. --- man/git-psykorebase.1 | 15 ++++++++++++--- man/git-psykorebase.html | 19 +++++++++++-------- man/git-psykorebase.md | 3 +++ 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/man/git-psykorebase.1 b/man/git-psykorebase.1 index bc65dc2..2da16e5 100644 --- a/man/git-psykorebase.1 +++ b/man/git-psykorebase.1 @@ -7,13 +7,19 @@ \fBgit\-psykorebase\fR \- Rebase a branch with a merge commit . .SH "SYNOPSIS" -\fBgit\-psykorebase\fR [] [\-\-no\-ff] \fBgit\-psykorebase\fR \-\-continue +\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\. \fB\-\-continue\fR Continue the rebase after conflicts have been resolved\. +\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: @@ -64,4 +70,7 @@ Based on Benoît Bryon <\fIbenoit@marmelune\.net\fR> implementation in Python\. <\fIhttps://github\.com/tj/git\-extras/issues\fR> . .SH "SEE ALSO" -<\fIhttps://github\.com/tj/git\-extras\fR> <\fIhttps://github\.com/benoitbryon/psykorebase\fR> +<\fIhttps://github\.com/tj/git\-extras\fR> +. +.P +<\fIhttps://github\.com/benoitbryon/psykorebase\fR> diff --git a/man/git-psykorebase.html b/man/git-psykorebase.html index 454fb4b..a17acb0 100644 --- a/man/git-psykorebase.html +++ b/man/git-psykorebase.html @@ -76,8 +76,9 @@

SYNOPSIS

-

git-psykorebase <target_branch> [<feature_branch>] [--no-ff] -git-psykorebase --continue

+

git-psykorebase <target_branch> [<feature_branch>] [--no-ff]

+ +

git-psykorebase --continue

DESCRIPTION

@@ -86,8 +87,9 @@

OPTIONS

-

--no-ff Force a commit message even if there are no conflicts. - --continue Continue the rebase after conflicts have been resolved.

+

--no-ff Force a commit message even if there are no conflicts.

+ +

--continue Continue the rebase after conflicts have been resolved.

EXAMPLES

@@ -108,9 +110,9 @@

AUTHOR

-

Written by Rémy Hubscher <rhubscher@mozilla.com>

+

Written by Rémy Hubscher <rhubscher@mozilla.com>

-

Based on Benoît Bryon <benoit@marmelune.net> implementation in +

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

REPORTING BUGS

@@ -119,8 +121,9 @@ Python.

SEE ALSO

-

<https://github.com/tj/git-extras> -<https://github.com/benoitbryon/psykorebase>

+

<https://github.com/tj/git-extras>

+ +

<https://github.com/benoitbryon/psykorebase>

    diff --git a/man/git-psykorebase.md b/man/git-psykorebase.md index 7d02807..ad0ce96 100644 --- a/man/git-psykorebase.md +++ b/man/git-psykorebase.md @@ -4,6 +4,7 @@ git-psykorebase(1) -- Rebase a branch with a merge commit ## SYNOPSIS `git-psykorebase` <target_branch> [<feature_branch>] [--no-ff] + `git-psykorebase` --continue ## DESCRIPTION @@ -14,6 +15,7 @@ Rebase the `feature_branch` on top of the `target_branch`, the ## OPTIONS `--no-ff` Force a commit message even if there are no conflicts. + `--continue` Continue the rebase after conflicts have been resolved. ## EXAMPLES @@ -44,4 +46,5 @@ Python. ## SEE ALSO <> + <>