diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-05-28 12:42:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-28 20:22:32 (GMT) |
| commit | db4a3f26c373fd73688991fbeb76b2d00b9a470c (patch) | |
| tree | 1787f9abed34e43cb6727779c33c4ed88a975c81 /Documentation/git-pull.txt | |
| parent | 427c3bd28ab504443d0eea6fc6aa27b0c0748372 (diff) | |
| download | git-db4a3f26c373fd73688991fbeb76b2d00b9a470c.zip git-db4a3f26c373fd73688991fbeb76b2d00b9a470c.tar.gz git-db4a3f26c373fd73688991fbeb76b2d00b9a470c.tar.bz2 | |
tests: mark a couple more test cases as requiring `rebase -p`
The `--preserve-merges` option has been deprecated, and as a consequence
we started to mark test cases that require that option to be supported,
in preparation for removing that support eventually.
Since we marked those test cases, a couple more crept into the test
suite, and with this patch, we mark them, too.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-pull.txt')
0 files changed, 0 insertions, 0 deletions