diff options
| author |  Philippe Blain <levraiphilippeblain@gmail.com> | 2020-11-14 00:34:44 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-11-16 16:01:13 -0800 |
| commit | f260c6b46c1ebb5b1b4dfffd8812b5416cfcc4e7 (patch) | |
| tree | 654d6824940b3f9599e4e7d366e23dc8d4061474 /t/t4101/diff.1-2 | |
| parent | t5572: add notes on a peculiar test (diff) | |
| download | tgif-f260c6b46c1ebb5b1b4dfffd8812b5416cfcc4e7.tar.xz | |
t5572: describe '--rebase' tests a little more
It can be hard at first glance to distinguish what is different between
the two tests 'recursive rebasing pull' and 'pull rebase recursing fails
with conflicts' in 't5572-pull-submodule.sh', and to understand how they
relate to the scenarios described in a6d7eb2c7a (pull: optionally rebase
submodules (remote submodule changes only), 2017-06-23), which
implemented '--recurse-submodules' for 'git pull' and added these tests.
Rename the tests to be more descriptive and add some bullet points
comments describing the different scenarios.
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4101/diff.1-2')
0 files changed, 0 insertions, 0 deletions