diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-09-18 12:30:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-18 12:30:01 -0700 |
| commit | cb705397f111dc1fcb3e3fa844bfd5b3050dee38 (patch) | |
| tree | 7a08f9890ae401f03a3d3fb034c06f1be74e727e /git-rebase.html | |
| parent | 926cc052d4e49ae0c1af3703c87b0d1037d7fbac (diff) | |
| download | git-htmldocs-cb705397f111dc1fcb3e3fa844bfd5b3050dee38.tar.gz | |
Autogenerated HTML docs for v2.23.0-256-g4c861
Diffstat (limited to 'git-rebase.html')
| -rw-r--r-- | git-rebase.html | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/git-rebase.html b/git-rebase.html index ba40a0f94..606e2a778 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -1653,16 +1653,6 @@ used to override and disable this setting.</p></div> --preserve-merges and --rebase-merges
</p>
</li>
-<li>
-<p>
---rebase-merges and --strategy
-</p>
-</li>
-<li>
-<p>
---rebase-merges and --strategy-option
-</p>
-</li>
</ul></div>
</div>
</div>
@@ -2461,7 +2451,7 @@ Use <code>--rebase-merges</code> in such scenarios instead.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2019-07-09 19:51:04 PDT
+ 2019-09-18 12:25:17 PDT
</div>
</div>
</body>
|