diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-01-22 07:57:59 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-01-22 07:57:59 +0000 |
| commit | 364b6a4e15285cad6c674f515c0aa3538cfed028 (patch) | |
| tree | 9a5be23615ae916761404d7533eee4cf4af6ea8c /git-rebase.html | |
| parent | 1aa40d2e3f5186afb805e7020577acb9f5f78b89 (diff) | |
| download | git-htmldocs-364b6a4e15285cad6c674f515c0aa3538cfed028.tar.gz | |
Autogenerated HTML docs for v1.6.6.1-394-gdedc0
Diffstat (limited to 'git-rebase.html')
| -rw-r--r-- | git-rebase.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-rebase.html b/git-rebase.html index 7ec0e3628..9755d43f4 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -736,7 +736,7 @@ which makes little sense.</p></div> When the commit log message begins with "squash! …" (or
"fixup! …"), and there is a commit whose title begins with
the same …, automatically modify the todo list of rebase -i
- so that the commit marked for quashing come right after the
+ so that the commit marked for squashing comes right after the
commit to be modified, and change the action of the moved
commit from <tt>pick</tt> to <tt>squash</tt> (or <tt>fixup</tt>).
</p>
@@ -1199,7 +1199,7 @@ Johannes E. Schindelin <johannes.schindelin@gmx.de></p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-01-21 17:44:35 UTC
+Last updated 2010-01-22 07:57:43 UTC
</div>
</div>
</body>
|