diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-13 15:00:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-13 15:00:05 -0700 |
| commit | 92d80370646a0ce43b0c769027492b3c891090aa (patch) | |
| tree | cee7315334fee3145cb4badcc7a400e3e763fbac /git-rebase.html | |
| parent | 48931e26012d8d7ad1a7e1d9701f52be1b77e45a (diff) | |
| download | git-htmldocs-92d80370646a0ce43b0c769027492b3c891090aa.tar.gz | |
Autogenerated HTML docs for v2.9.1-273-g79ed4
Diffstat (limited to 'git-rebase.html')
| -rw-r--r-- | git-rebase.html | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/git-rebase.html b/git-rebase.html index 6976448c1..4c968744f 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -944,7 +944,7 @@ rebase.autoSquash </dt>
<dd>
<p>
- If set to true enable <em>--autosquash</em> option by default.
+ If set to true enable <code>--autosquash</code> option by default.
</p>
</dd>
<dt class="hdlist1">
@@ -952,7 +952,7 @@ rebase.autoStash </dt>
<dd>
<p>
- If set to true enable <em>--autostash</em> option by default.
+ If set to true enable <code>--autostash</code> option by default.
</p>
</dd>
<dt class="hdlist1">
@@ -971,7 +971,7 @@ rebase.instructionFormat </dt>
<dd>
<p>
- Custom commit list format to use during an <em>--interactive</em> rebase.
+ Custom commit list format to use during an <code>--interactive</code> rebase.
</p>
</dd>
</dl></div>
@@ -1346,8 +1346,8 @@ without an explicit <code>--interactive</code>.</p></div> "fixup! " or "squash! " after the first, in case you referred to an
earlier fixup/squash with <code>git commit --fixup/--squash</code>.
</p>
-<div class="paragraph"><p>This option is only valid when the <em>--interactive</em> option is used.</p></div>
-<div class="paragraph"><p>If the <em>--autosquash</em> option is enabled by default using the
+<div class="paragraph"><p>This option is only valid when the <code>--interactive</code> option is used.</p></div>
+<div class="paragraph"><p>If the <code>--autosquash</code> option is enabled by default using the
configuration variable <code>rebase.autoSquash</code>, this option can be
used to override and disable this setting.</p></div>
</dd>
@@ -2022,7 +2022,7 @@ reorder commits tend to produce counterintuitive results.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2016-04-06 15:57:48 PDT
+Last updated 2016-07-13 14:58:50 PDT
</div>
</div>
</body>
|