diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-03-09 17:36:47 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-11 23:52:33 +0200 |
| commit | caafecfcf13e58b474c33db093c9deacd11ceb08 (patch) | |
| tree | f2dff2baa19a7985f742563a393376a18db41514 /merge.c | |
| parent | rebase --rebase-merges: add support for octopus merges (diff) | |
| download | git-caafecfcf13e58b474c33db093c9deacd11ceb08.tar.xz git-caafecfcf13e58b474c33db093c9deacd11ceb08.zip | |
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>
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions