diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-03-09 19:36:47 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-12 00:52:33 +0300 |
| commit | caafecfcf13e58b474c33db093c9deacd11ceb08 (patch) | |
| tree | f2dff2baa19a7985f742563a393376a18db41514 /builtin/am.c | |
| parent | 2b6ad0f4bca508a04e2b6e940e37f7d98c1a8696 (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>
Diffstat (limited to 'builtin/am.c')
0 files changed, 0 insertions, 0 deletions