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.txt | |
| parent | 926cc052d4e49ae0c1af3703c87b0d1037d7fbac (diff) | |
| download | git-htmldocs-cb705397f111dc1fcb3e3fa844bfd5b3050dee38.tar.gz | |
Autogenerated HTML docs for v2.23.0-256-g4c861
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index 6156609cf..3136c19fb 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -543,8 +543,6 @@ In addition, the following pairs of options are incompatible: * --preserve-merges and --interactive * --preserve-merges and --signoff * --preserve-merges and --rebase-merges - * --rebase-merges and --strategy - * --rebase-merges and --strategy-option BEHAVIORAL DIFFERENCES ----------------------- |