mirror of
https://github.com/tj/git-extras.git
synced 2026-09-10 07:26:17 -04:00
Merge pull request #886 from TheTechOddBug/master
Fixing summary for --squash-msg option.
This commit is contained in:
commit
317eea64db
|
|
@ -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\.
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@
|
|||
|
||||
<h2 id="SYNOPSIS">SYNOPSIS</h2>
|
||||
|
||||
<p><code>git-squash</code> [<--squash-messages>] <source-branch|commit ref> [<commit-message>]</p>
|
||||
<p><code>git-squash</code> [<--squash-msg>] <source-branch|commit ref> [<commit-message>]</p>
|
||||
|
||||
<h2 id="DESCRIPTION">DESCRIPTION</h2>
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ git-squash(1) -- Import changes from a branch
|
|||
|
||||
## SYNOPSIS
|
||||
|
||||
`git-squash` [<--squash-messages>] <source-branch|commit ref> [<commit-message>]
|
||||
`git-squash` [<--squash-msg>] <source-branch|commit ref> [<commit-message>]
|
||||
|
||||
## DESCRIPTION
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue