diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-05-04 01:01:29 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-05-06 13:21:58 +0900 |
| commit | 8fa6eea0ffd271f0564048dc939987e9640efca5 (patch) | |
| tree | 0af599a25e6680e388b0bc623e14c184c91ea99a /merge.c | |
| parent | rebase --rebase-merges: a "merge" into a new root is a fast-forward (diff) | |
| download | tgif-8fa6eea0ffd271f0564048dc939987e9640efca5.tar.xz | |
rebase --rebase-merges: root commits can be cousins, too
Reported by Wink Saville: when rebasing with no-rebase-cousins, we
will want to refrain from rebasing all of them, even when they are
root commits.
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