]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2b6ad0f) | patch
rebase --rebase-merges: adjust man page for octopus support
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Fri, 9 Mar 2018 16:36:47 +0000 (17:36 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Jul 2018 21:52:33 +0000 (14:52 -0700)
commitcaafecfcf13e58b474c33db093c9deacd11ceb08
treef2dff2baa19a7985f742563a393376a18db41514tree | snapshot
parent2b6ad0f4bca508a04e2b6e940e37f7d98c1a8696commit | diff
rebase --rebase-merges: adjust man page for octopus support

Now that we support octopus merges in the `--rebase-merges` mode,
we should give users who actually read the manuals a chance to know
about this fact.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-rebase.txt diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.