Merge pull request #886 from TheTechOddBug/master

Fixing summary for --squash-msg option.
This commit is contained in:
罗泽轩 2020-10-10 09:09:50 +08:00 committed by GitHub
commit 317eea64db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions

View file

@ -7,7 +7,7 @@
\fBgit\-squash\fR \- Import changes from a branch
.
.SH "SYNOPSIS"
\fBgit\-squash\fR [<\-\-squash\-messages>] <source\-branch|commit ref> [<commit\-message>]
\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\.

View file

@ -76,7 +76,7 @@
<h2 id="SYNOPSIS">SYNOPSIS</h2>
<p><code>git-squash</code> [&lt;--squash-messages&gt;] &lt;source-branch|commit ref&gt; [&lt;commit-message&gt;]</p>
<p><code>git-squash</code> [&lt;--squash-msg&gt;] &lt;source-branch|commit ref&gt; [&lt;commit-message&gt;]</p>
<h2 id="DESCRIPTION">DESCRIPTION</h2>

View file

@ -3,7 +3,7 @@ git-squash(1) -- Import changes from a branch
## SYNOPSIS
`git-squash` [&lt;--squash-messages&gt;] &lt;source-branch|commit ref&gt; [&lt;commit-message&gt;]
`git-squash` [&lt;--squash-msg&gt;] &lt;source-branch|commit ref&gt; [&lt;commit-message&gt;]
## DESCRIPTION