summaryrefslogtreecommitdiff
path: root/Documentation/gitcli.txt
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2018-10-31 13:02:02 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-11-02 11:27:30 +0900
commit11aad46432b21f9779a3f303335b8e0a187f98a1 (patch)
tree5dd5c6a10593e7d33ebf5438a7f5c5ca9d63e312 /Documentation/gitcli.txt
parentt3418: decouple test cases from a previous `rebase -p` test case (diff)
downloadtgif-11aad46432b21f9779a3f303335b8e0a187f98a1.tar.xz
tests: optionally skip `git rebase -p` tests
The `--preserve-merges` mode of the `rebase` command is slated to be deprecated soon, as the more powerful `--rebase-merges` mode is available now, and the latter was designed with the express intent to address the shortcomings of `--preserve-merges`' design (e.g. the inability to reorder commits in an interactive rebase). As such, we will eventually even remove the `--preserve-merges` support, and along with it, its tests. In preparation for this, and also to allow the Windows phase of our automated tests to save some well-needed time when running the test suite, this commit introduces a new prerequisite REBASE_P, which can be forced to being unmet by setting the environment variable `GIT_TEST_SKIP_REBASE_P` to any non-empty string. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/gitcli.txt')
0 files changed, 0 insertions, 0 deletions