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

Merge pull request #595 from aaguilera/master

Browse source 
fix: git-squash docs. Replaced 'actual' with 'current'
This commit is contained in:
罗泽轩 2016-11-18 10:18:38 +08:00 committed by GitHub
parent ec64fe6500 77e55640d7
commit e1f0f6937a
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
man/git-squash.1
View file

@ -16,7 +16,7 @@ Produce the working tree and index state as if a real merge happened without the
<source\-branch>
.
.P
Branch to squash on the actual branch\.
Branch to squash on the current branch\.
.
.P
<commit reference> A commit reference (has to be from the current branch) can also be used as the first argument\. A range of commits \fIsha\fR\.\.HEAD will be squashed\.

2
man/git-squash.html
View file

@ -87,7 +87,7 @@
<p> &lt;source-branch&gt;</p>
<p> Branch to squash on the actual branch.</p>
<p> Branch to squash on the current branch.</p>
<p> &lt;commit reference&gt;
A commit reference (has to be from the current branch) can also be used as the

2
man/git-squash.md
View file

@ -14,7 +14,7 @@ git-squash(1) -- Import changes from a branch
&lt;source-branch&gt;
Branch to squash on the actual branch.
Branch to squash on the current branch.
&lt;commit reference&gt;
A commit reference (has to be from the current branch) can also be used as the