diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-02-23 13:39:26 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-23 11:30:52 -0800 |
| commit | 67f6905b8ac3468f271866e819232440238f9525 (patch) | |
| tree | 7e06322d48f7a399a6638130a647bbfbdacf609c /commit.c | |
| parent | 6f283c2e9df856941f40273cbf5fe695a8ec665c (diff) | |
| download | git-67f6905b8ac3468f271866e819232440238f9525.tar.gz | |
pull: accept --rebase=recreate to recreate the branch topology
Similar to the `preserve` mode simply passing the `--preserve-merges`
option to the `rebase` command, the `recreate` mode simply passes the
`--recreate-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>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions