mirror of
https://github.com/tj/git-extras.git
synced 2026-09-10 07:26:17 -04:00
squash help: ran make man/git-squash.{html,1}
This commit is contained in:
thomas menzel
parent
da34968ec3
commit
35d544b8c6
|
|
@ -85,7 +85,7 @@ git-extras(1) -- Awesome GIT utilities
|
|||
- **git-show-merged-branches(1)** Show merged branches
|
||||
- **git-show-tree(1)** show branch tree of commit history
|
||||
- **git-show-unmerged-branches(1)** Show unmerged branches
|
||||
- **git-squash(1)** Import changes from a branch
|
||||
- **git-squash(1)** squash N last changes up to a ref'ed commit
|
||||
- **git-stamp(1)** Stamp the last commit message
|
||||
- **git-standup(1)** Recall the commit history
|
||||
- **git-summary(1)** Show repository summary
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-SQUASH" "1" "November 2019" "" "Git Extras"
|
||||
.TH "GIT\-SQUASH" "1" "October 2020" "" "Git Extras"
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-squash\fR \- Import changes from a branch
|
||||
\fBgit\-squash\fR \- squash N last changes up to a ref\'ed commit
|
||||
.
|
||||
.SH "SYNOPSIS"
|
||||
\fBgit\-squash\fR [<\-\-squash\-msg>] <source\-branch|commit ref> [<commit\-message>]
|
||||
.
|
||||
.SH "DESCRIPTION"
|
||||
Produce the working tree and index state as if a real merge happened without the commit or merge marks\.
|
||||
Squash the N last changes in the current branch, where N is the range of commits from the given ref up to HEAD\.
|
||||
.
|
||||
.SH "OPTIONS"
|
||||
<source\-branch>
|
||||
|
|
@ -31,12 +31,13 @@ Commit the squash result with the concatenated squashed committed messages\. Thi
|
|||
<commit\-message>
|
||||
.
|
||||
.P
|
||||
If commit\-message is given, commit the squash result\.
|
||||
If commit\-message is given, commit the squashed result, otherwise the squash remains just added to the index and is not committed\.
|
||||
.
|
||||
.SH "EXAMPLES"
|
||||
.
|
||||
.nf
|
||||
|
||||
# squash changes and follow up with separate commit step
|
||||
$ git squash my\-other\-branch
|
||||
Updating a2740f5\.\.533b19c
|
||||
Fast\-forward
|
||||
|
|
@ -45,7 +46,10 @@ Squash commit \-\- not updating HEAD
|
|||
1 file changed, 1 insertion(+)
|
||||
$ git commit \-m "New commit without a real merge"
|
||||
|
||||
# squash and commit with given message
|
||||
$ git squash HEAD~3 "Commit message"
|
||||
|
||||
# squash and commit and concatenate all messages
|
||||
$ git squash \-\-squash\-msg @~3
|
||||
.
|
||||
.fi
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<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)'>
|
||||
<title>git-squash(1) - Import changes from a branch</title>
|
||||
<title>git-squash(1) - squash N last changes up to a ref'ed commit</title>
|
||||
<style type='text/css' media='all'>
|
||||
/* style: man */
|
||||
body#manpage {margin:0}
|
||||
|
|
@ -71,7 +71,7 @@
|
|||
|
||||
<h2 id="NAME">NAME</h2>
|
||||
<p class="man-name">
|
||||
<code>git-squash</code> - <span class="man-whatis">Import changes from a branch</span>
|
||||
<code>git-squash</code> - <span class="man-whatis">squash N last changes up to a ref'ed commit</span>
|
||||
</p>
|
||||
|
||||
<h2 id="SYNOPSIS">SYNOPSIS</h2>
|
||||
|
|
@ -80,8 +80,7 @@
|
|||
|
||||
<h2 id="DESCRIPTION">DESCRIPTION</h2>
|
||||
|
||||
<p> Produce the working tree and index state as if a real merge happened without
|
||||
the commit or merge marks.</p>
|
||||
<p> Squash the N last changes in the current branch, where N is the range of commits from the given ref up to HEAD.</p>
|
||||
|
||||
<h2 id="OPTIONS">OPTIONS</h2>
|
||||
|
||||
|
|
@ -100,11 +99,12 @@
|
|||
|
||||
<p> <commit-message></p>
|
||||
|
||||
<p> If commit-message is given, commit the squash result.</p>
|
||||
<p> If commit-message is given, commit the squashed result, otherwise the squash remains just added to the index and is not committed.</p>
|
||||
|
||||
<h2 id="EXAMPLES">EXAMPLES</h2>
|
||||
|
||||
<pre><code>$ git squash my-other-branch
|
||||
<pre><code># squash changes and follow up with separate commit step
|
||||
$ git squash my-other-branch
|
||||
Updating a2740f5..533b19c
|
||||
Fast-forward
|
||||
Squash commit -- not updating HEAD
|
||||
|
|
@ -112,13 +112,16 @@ Squash commit -- not updating HEAD
|
|||
1 file changed, 1 insertion(+)
|
||||
$ git commit -m "New commit without a real merge"
|
||||
|
||||
# squash and commit with given message
|
||||
$ git squash HEAD~3 "Commit message"
|
||||
|
||||
# squash and commit and concatenate all messages
|
||||
$ git squash --squash-msg @~3
|
||||
</code></pre>
|
||||
|
||||
<h2 id="AUTHOR">AUTHOR</h2>
|
||||
|
||||
<p>Written by Jesús Espino <<a href="mailto:jespinog@gmail.com" data-bare-link="true">jespinog@gmail.com</a>></p>
|
||||
<p>Written by Jesús Espino <<a href="mailto:jespinog@gmail.com" data-bare-link="true">jespinog@gmail.com</a>></p>
|
||||
|
||||
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
|
||||
|
||||
|
|
@ -131,7 +134,7 @@ $ git squash --squash-msg @~3
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>November 2019</li>
|
||||
<li class='tc'>October 2020</li>
|
||||
<li class='tr'>git-squash(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue