| commit | e037c2e41869489c1e17701a9f1c429ad9c18f9b | |
| author | Elijah Newren <newren@gmail.com> | |
| Wed, 4 Aug 2021 23:50:45 +0000 (4 23:50 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 5 Aug 2021 15:57:39 +0000 (5 08:57 -0700) | ||
| tree | 95bdb95e6c4e7a8f50da2c2a03214d1bd372b3e8 | treesnapshot (tar.gz zip) |
| parent | 66262451ec94d30ac4b80eb3123549cf7a788afd | commitdiff |
git-rebase.txt: correct antiquated claims about --rebase-merges
When --rebase-merges was first introduced, it only worked with the
`recursive` strategy. Some time later, it gained support for merges
using the `octopus` strategy. The limitation of only supporting these
two strategies was documented in 25cff9f109 ("rebase -i --rebase-merges:
add a section to the man page", 2018-04-25) and lifted in e145d99347
("rebase -r: support merge strategies other than `recursive`",
2019-07-31). However, when the limitation was lifted, the documentation
was not updated. Update it now.
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Acked-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When --rebase-merges was first introduced, it only worked with the
`recursive` strategy. Some time later, it gained support for merges
using the `octopus` strategy. The limitation of only supporting these
two strategies was documented in 25cff9f109 ("rebase -i --rebase-merges:
add a section to the man page", 2018-04-25) and lifted in e145d99347
("rebase -r: support merge strategies other than `recursive`",
2019-07-31). However, when the limitation was lifted, the documentation
was not updated. Update it now.
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Acked-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-rebase.txt | diffblobblamehistory |