| commit | 1131ec98189e993dcc48043c4f8e8b0128f52055 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Wed, 25 Apr 2018 12:29:38 +0000 (25 14:29 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 26 Apr 2018 03:28:43 +0000 (26 12:28 +0900) | ||
| tree | d22836ec39f637e12847dd05172c82865d510808 | treesnapshot (tar.gz zip) |
| parent | 7ccdf65b63f2f4a5e751d70b9788af3c9e16b6ab | commitdiff |
pull: accept --rebase=merges to recreate the branch topology
Similar to the `preserve` mode simply passing the `--preserve-merges`
option to the `rebase` command, the `merges` mode simply passes the
`--rebase-merges` option.
This will allow users to conveniently rebase non-trivial commit
topologies when pulling new commits, without flattening them.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Similar to the `preserve` mode simply passing the `--preserve-merges`
option to the `rebase` command, the `merges` mode simply passes the
`--rebase-merges` option.
This will allow users to conveniently rebase non-trivial commit
topologies when pulling new commits, without flattening them.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>