utils-code/tj.git-extras
1
0
Fork 0
mirror of https://github.com/tj/git-extras.git synced 2026-09-10 07:26:17 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Improve man page presentation.

Browse source
This commit is contained in:
Rémy HUBSCHER 2015-08-11 11:30:36 +02:00
parent 84699acc6e
commit fa4c5dd456
3 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
man/git-psykorebase.1
View file

@ -7,13 +7,19 @@
\fBgit\-psykorebase\fR \- Rebase a branch with a merge commit
.
.SH "SYNOPSIS"
\fBgit\-psykorebase\fR <target_branch> [<feature_branch>] [\-\-no\-ff] \fBgit\-psykorebase\fR \-\-continue
\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\. \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>

19
man/git-psykorebase.html
View file

@ -76,8 +76,9 @@
<h2 id="SYNOPSIS">SYNOPSIS</h2>
<p><code>git-psykorebase</code> &lt;target_branch&gt; [&lt;feature_branch&gt;] [--no-ff]
<code>git-psykorebase</code> --continue</p>
<p><code>git-psykorebase</code> &lt;target_branch&gt; [&lt;feature_branch&gt;] [--no-ff]</p>
<p><code>git-psykorebase</code> --continue</p>
<h2 id="DESCRIPTION">DESCRIPTION</h2>
@ -86,8 +87,9 @@
<h2 id="OPTIONS">OPTIONS</h2>
<p> <code>--no-ff</code> Force a commit message even if there are no conflicts.
<code>--continue</code> Continue the rebase after conflicts have been resolved.</p>
<p> <code>--no-ff</code> Force a commit message even if there are no conflicts.</p>
<p> <code>--continue</code> Continue the rebase after conflicts have been resolved.</p>
<h2 id="EXAMPLES">EXAMPLES</h2>
@ -108,9 +110,9 @@
<h2 id="AUTHOR">AUTHOR</h2>
<p>Written by R&eacute;my Hubscher &lt;<a href="&#109;&#x61;&#105;&#x6c;&#x74;&#x6f;&#x3a;&#114;&#104;&#117;&#98;&#115;&#x63;&#104;&#x65;&#x72;&#x40;&#109;&#x6f;&#x7a;&#105;&#x6c;&#108;&#x61;&#x2e;&#99;&#x6f;&#109;" data-bare-link="true">&#114;&#104;&#x75;&#x62;&#115;&#x63;&#104;&#x65;&#114;&#x40;&#x6d;&#x6f;&#x7a;&#x69;&#x6c;&#x6c;&#x61;&#46;&#99;&#111;&#x6d;</a>&gt;</p>
<p>Written by R&eacute;my Hubscher &lt;<a href="&#x6d;&#x61;&#105;&#108;&#116;&#x6f;&#x3a;&#114;&#104;&#117;&#x62;&#x73;&#99;&#104;&#x65;&#114;&#x40;&#109;&#111;&#122;&#x69;&#108;&#x6c;&#x61;&#x2e;&#99;&#x6f;&#109;" data-bare-link="true">&#x72;&#104;&#117;&#98;&#x73;&#x63;&#x68;&#x65;&#114;&#64;&#x6d;&#x6f;&#122;&#x69;&#108;&#108;&#x61;&#x2e;&#99;&#111;&#x6d;</a>&gt;</p>
<p>Based on Beno&icirc;t Bryon &lt;<a href="&#109;&#97;&#x69;&#x6c;&#116;&#111;&#58;&#98;&#x65;&#110;&#111;&#105;&#x74;&#x40;&#109;&#x61;&#114;&#x6d;&#x65;&#x6c;&#117;&#110;&#x65;&#x2e;&#110;&#101;&#116;" data-bare-link="true">&#98;&#101;&#x6e;&#x6f;&#105;&#x74;&#x40;&#x6d;&#x61;&#x72;&#109;&#x65;&#x6c;&#117;&#x6e;&#x65;&#46;&#x6e;&#x65;&#x74;</a>&gt; implementation in
<p>Based on Beno&icirc;t Bryon &lt;<a href="&#109;&#x61;&#x69;&#108;&#116;&#111;&#x3a;&#98;&#x65;&#x6e;&#x6f;&#x69;&#116;&#x40;&#109;&#x61;&#114;&#x6d;&#x65;&#108;&#x75;&#110;&#101;&#46;&#110;&#101;&#x74;" data-bare-link="true">&#x62;&#101;&#110;&#x6f;&#105;&#x74;&#64;&#109;&#x61;&#114;&#x6d;&#x65;&#x6c;&#x75;&#110;&#x65;&#x2e;&#x6e;&#x65;&#116;</a>&gt; implementation in
Python.</p>
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
@ -119,8 +121,9 @@ Python.</p>
<h2 id="SEE-ALSO">SEE ALSO</h2>
<p>&lt;<a href="https://github.com/tj/git-extras" data-bare-link="true">https://github.com/tj/git-extras</a>&gt;
&lt;<a href="https://github.com/benoitbryon/psykorebase" data-bare-link="true">https://github.com/benoitbryon/psykorebase</a>&gt;</p>
<p>&lt;<a href="https://github.com/tj/git-extras" data-bare-link="true">https://github.com/tj/git-extras</a>&gt;</p>
<p>&lt;<a href="https://github.com/benoitbryon/psykorebase" data-bare-link="true">https://github.com/benoitbryon/psykorebase</a>&gt;</p>
<ol class='man-decor man-foot man foot'>

3
man/git-psykorebase.md
View file

@ -4,6 +4,7 @@ git-psykorebase(1) -- Rebase a branch with a merge commit
## SYNOPSIS
`git-psykorebase` &lt;target_branch&gt; [&lt;feature_branch&gt;] [--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
&lt;<https://github.com/tj/git-extras>&gt;
&lt;<https://github.com/benoitbryon/psykorebase>&gt;