diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-18 22:47:56 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-18 22:47:56 (GMT) |
| commit | 223a1bfb5821387981c700654e4edd2443c5a7fc (patch) | |
| tree | ae4464af9b68e958f7c7991bce7a96f515054487 /t/test-lib.sh | |
| parent | 0ef08090d2a391e0ce037eafd2b391e3f76b1060 (diff) | |
| parent | 17919c3585ba9df9c65ea4a5f7300543dfba5f9f (diff) | |
| download | git-223a1bfb5821387981c700654e4edd2443c5a7fc.zip git-223a1bfb5821387981c700654e4edd2443c5a7fc.tar.gz git-223a1bfb5821387981c700654e4edd2443c5a7fc.tar.bz2 | |
Merge branch 'js/retire-preserve-merges'
The "--preserve-merges" option of "git rebase" has been removed.
* js/retire-preserve-merges:
sequencer: restrict scope of a formerly public function
rebase: remove a no-longer-used function
rebase: stop mentioning the -p option in comments
rebase: remove obsolete code comment
rebase: drop the internal `rebase--interactive` command
git-svn: drop support for `--preserve-merges`
rebase: drop support for `--preserve-merges`
pull: remove support for `--rebase=preserve`
tests: stop testing `git rebase --preserve-merges`
remote: warn about unhandled branch.<name>.rebase values
t5520: do not use `pull.rebase=preserve`
Diffstat (limited to 't/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index 8361b5c..151da80 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1730,10 +1730,6 @@ test_lazy_prereq SHA1 ' esac ' -test_lazy_prereq REBASE_P ' - test -z "$GIT_TEST_SKIP_REBASE_P" -' - # Ensure that no test accidentally triggers a Git command # that runs the actual maintenance scheduler, affecting a user's # system permanently. |