diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-04-25 14:29:38 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-04-26 12:28:43 +0900 |
| commit | 1131ec98189e993dcc48043c4f8e8b0128f52055 (patch) | |
| tree | d22836ec39f637e12847dd05172c82865d510808 /block-sha1/sha1.h | |
| parent | rebase --rebase-merges: avoid "empty merges" (diff) | |
| download | tgif-1131ec98189e993dcc48043c4f8e8b0128f52055.tar.xz | |
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>
Diffstat (limited to 'block-sha1/sha1.h')
0 files changed, 0 insertions, 0 deletions