diff options
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 63fbe15bc..a8353acca 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -1561,7 +1561,7 @@ be used to review and edit the todo list before proceeding.</p></div> <code>--squash</code>, <code>--fixup</code>, <code>--fixup=amend:</code> or <code>--fixup=reword:</code> options of
<a href="git-commit.html">git-commit(1)</a>, which take the target commit as an argument and
automatically fill in the subject line of the new commit from that.</p></div>
-<div class="paragraph"><p>Settting configuration variable <code>rebase.autoSquash</code> to true enables
+<div class="paragraph"><p>Setting configuration variable <code>rebase.autoSquash</code> to true enables
auto-squashing by default for interactive rebase. The <code>--no-autosquash</code>
option can be used to override that setting.</p></div>
<div class="paragraph"><p>See also INCOMPATIBLE OPTIONS below.</p></div>
@@ -2810,7 +2810,7 @@ sequence.editor <div id="footer">
<div id="footer-text">
Last updated
- 2024-01-29 16:09:11 PST
+ 2024-03-05 10:14:09 PST
</div>
</div>
</body>
|