Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add rebase script #1936

Open
wants to merge 6 commits into
base: dev-v2.6
Choose a base branch
from
Open

Add rebase script #1936

wants to merge 6 commits into from

Commits on Sep 22, 2022

  1. Add rebase script

    Arvind Iyengar committed Sep 22, 2022
    Configuration menu
    Copy the full SHA
    fc7824d View commit details
    Browse the repository at this point in the history

  2. Add support for patching excludes directory

    Arvind Iyengar committed Sep 22, 2022
    Configuration menu
    Copy the full SHA
    e788837 View commit details
    Browse the repository at this point in the history

  3. Update rebase script for yq v4

    Arvind Iyengar committed Sep 22, 2022
    Configuration menu
    Copy the full SHA
    95b257f View commit details
    Browse the repository at this point in the history

  4. Bring in changes from monitoring 19.x.x rebase 

    Bring in the changes in rancher#1567 that came from Jack testing the scripts out.
    Arvind Iyengar committed Sep 22, 2022
    Configuration menu
    Copy the full SHA
    b003b84 View commit details
    Browse the repository at this point in the history

  5. Remove --rejoin flags 

    In newer versions of Git, these arguments cannot be provided due to git/git@9a3e3ca.

Relevant comment:

> It could be argued that this change might break existing users.  I'd argue that those existing users are already broken, and they just don't know it.  Let them know that they're broken.
    Arvind Iyengar committed Sep 22, 2022
    Configuration menu
    Copy the full SHA
    e1d533e View commit details
    Browse the repository at this point in the history

  6. Add the ability to non-incrementally run rebase script

    Arvind Iyengar committed Sep 22, 2022
    Configuration menu
    Copy the full SHA
    e7b0529 View commit details
    Browse the repository at this point in the history