diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-10-19 00:47:56 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-10-19 00:47:56 +0200 |
commit | 223a1bfb5821387981c700654e4edd2443c5a7fc (patch) | |
tree | ae4464af9b68e958f7c7991bce7a96f515054487 /.github | |
parent | Merge branch 'rs/mergesort' (diff) | |
parent | sequencer: restrict scope of a formerly public function (diff) | |
download | git-223a1bfb5821387981c700654e4edd2443c5a7fc.tar.xz git-223a1bfb5821387981c700654e4edd2443c5a7fc.zip |
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 '.github')
-rw-r--r-- | .github/workflows/main.yml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4728168478..59acc35d37 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -198,7 +198,6 @@ jobs: shell: bash env: NO_SVN_TESTS: 1 - GIT_TEST_SKIP_REBASE_P: 1 run: ci/run-test-slice.sh ${{matrix.nr}} 10 - name: ci/print-test-failures.sh if: failure() |