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.

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

Merge remote-tracking branch origin/master into gsoc-2023-project #1489

Merged
merged 6 commits into from
May 29, 2023

Commits on May 26, 2023

  1. Configuration menu
    Copy the full SHA
    a98ed66 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2023

  1. Configuration menu
    Copy the full SHA
    4f619b5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    73d486e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a0aadc2 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2023

  1. Sync project branch improvements

    The repository appears to be initially created as a shallow clone.
    We need both branches in order to merge between two branches.  Fetch the
    remote repository with the unshallow option.  If that command fails,
    then fetch the remote repository without the unshallow option.  The hope
    is that one of the two fetch commands will succeed.
    
    Configure the user email address and user name in the repository so
    that the merge does not fail with the message that user name and user
    email are not configured.  The email address is fake, since no email is
    accepted at the jenkins.io site.
    
    Perform the merge with the `--no-edit` command so that merge knows it
    should not open an editor.  May be unnecessary, but should not be harmful.
    MarkEWaite committed May 29, 2023
    Configuration menu
    Copy the full SHA
    bcaa2cf View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/master' into gsoc-2023-project

    Sync project branch action committed May 29, 2023
    Configuration menu
    Copy the full SHA
    443d5b7 View commit details
    Browse the repository at this point in the history