mirror of
https://github.com/tj/git-extras.git
synced 2026-09-10 07:26:17 -04:00
Update man page export for git-psykorebase with ronn-ng 0.9.0
This commit is contained in:
Rémy HUBSCHER
parent
dd0337c3cf
commit
5afaa731e0
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv='content-type' value='text/html;charset=utf8'>
|
||||
<meta name='generator' value='Ronn/v0.7.3 (http://github.com/rtomayko/ronn/tree/0.7.3)'>
|
||||
<meta http-equiv='content-type' content='text/html;charset=utf8'>
|
||||
<meta name='generator' content='Ronn-NG/v0.9.0 (http://github.com/apjanke/ronn-ng/tree/0.9.0)'>
|
||||
<title>git-psykorebase(1) - Rebase a branch with a merge commit</title>
|
||||
<style type='text/css' media='all'>
|
||||
/* style: man */
|
||||
|
|
@ -69,11 +69,12 @@
|
|||
<li class='tr'>git-psykorebase(1)</li>
|
||||
</ol>
|
||||
|
||||
<h2 id="NAME">NAME</h2>
|
||||
|
||||
|
||||
<h2 id="NAME">NAME</h2>
|
||||
<p class="man-name">
|
||||
<code>git-psykorebase</code> - <span class="man-whatis">Rebase a branch with a merge commit</span>
|
||||
</p>
|
||||
|
||||
<h2 id="SYNOPSIS">SYNOPSIS</h2>
|
||||
|
||||
<p><code>git-psykorebase</code> <target_branch> [<feature_branch>] [--no-ff]</p>
|
||||
|
|
@ -87,32 +88,32 @@
|
|||
|
||||
<h2 id="OPTIONS">OPTIONS</h2>
|
||||
|
||||
<p> <code>--no-ff</code> Force a commit message even if there are no conflicts.</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>
|
||||
<p><code>--continue</code> Continue the rebase after conflicts have been resolved.</p>
|
||||
|
||||
<h2 id="EXAMPLES">EXAMPLES</h2>
|
||||
|
||||
<p> Rebase current branch on top of master:</p>
|
||||
<p>Rebase current branch on top of master:</p>
|
||||
|
||||
<pre><code>$ git psykorebase master --no-ff
|
||||
</code></pre>
|
||||
|
||||
<p> Handle conflicts:</p>
|
||||
<p>Handle conflicts:</p>
|
||||
|
||||
<pre><code>$ git add README.md
|
||||
</code></pre>
|
||||
|
||||
<p> Continue rebase:</p>
|
||||
<p>Continue rebase:</p>
|
||||
|
||||
<pre><code>$ git psykorebase --continue
|
||||
</code></pre>
|
||||
|
||||
<h2 id="AUTHOR">AUTHOR</h2>
|
||||
|
||||
<p>Written by Rémy Hubscher <<a href="mailto:rhubscher@mozilla.com" data-bare-link="true">rhubscher@mozilla.com</a>></p>
|
||||
<p>Written by Rémy Hubscher <<a href="mailto:hubscher.remy@gmail.com" data-bare-link="true">hubscher.remy@gmail.com</a>></p>
|
||||
|
||||
<p>Based on Benoît Bryon <<a href="mailto:benoit@marmelune.net" data-bare-link="true">benoit@marmelune.net</a>> implementation in
|
||||
<p>Based on Benoît Bryon <<a href="mailto:benoit@marmelune.net" data-bare-link="true">benoit@marmelune.net</a>> implementation in
|
||||
Python.</p>
|
||||
|
||||
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
|
||||
|
|
@ -125,10 +126,9 @@ Python.</p>
|
|||
|
||||
<p><<a href="https://github.com/benoitbryon/psykorebase" data-bare-link="true">https://github.com/benoitbryon/psykorebase</a>></p>
|
||||
|
||||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>October 2017</li>
|
||||
<li class='tc'>March 2020</li>
|
||||
<li class='tr'>git-psykorebase(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ Rebase the `feature_branch` on top of the `target_branch`, the
|
|||
|
||||
## AUTHOR
|
||||
|
||||
Written by Rémy Hubscher <<rhubscher@mozilla.com>>
|
||||
Written by Rémy Hubscher <<hubscher.remy@gmail.com>>
|
||||
|
||||
Based on Benoît Bryon <<benoit@marmelune.net>> implementation in
|
||||
Python.
|
||||
|
|
|
|||
Loading…
Reference in a new issue