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

Update sync-upstream with master #251

Merged
merged 7 commits into from
Jul 21, 2023
Merged

Update sync-upstream with master #251

merged 7 commits into from
Jul 21, 2023

Commits on Jul 17, 2023

  1. sync-upstream: allows providing the local branch via cli

    @jonasnick
    jonasnick committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    05b207e View commit details
    Browse the repository at this point in the history

  2. Merge BlockstreamResearch#239: sync-upstream: allows providing the lo… 

    …cal branch via cli

05b207e sync-upstream: allows providing the local branch via cli (Jonas Nick)

Pull request description:

ACKs for top commit:
  real-or-random:
    ACK 05b207e

Tree-SHA512: b02f3fdf6565943cea2b93a0b2b0a38c30bb3c94873d0c4ed2ad276c75f3dc610911d1c9c076c8b7fd3a5baf83aa1ab66ec86415333cf58fe8f07c64fa74656f
    @real-or-random
    real-or-random committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    533571d View commit details
    Browse the repository at this point in the history

  3. sync-upstream.sh: Fix position of "-b" option in reproduce command

    @real-or-random
    real-or-random committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    9b6a1c3 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2023

  1. Merge BlockstreamResearch#242: sync-upstream.sh: Fix position of "-b"… 

    … option in reproduce command

9b6a1c3 sync-upstream.sh: Fix position of "-b" option in reproduce command (Tim Ruffing)

Pull request description:

ACKs for top commit:
  jonasnick:
    utACK 9b6a1c3

Tree-SHA512: 27e4a41bc9c8f10715623f669c97a511520753b23d24ae91d6d2144e54588da0769f97b1de78c87b7471b39e556b682b1c2910b2bf71f124fb77cbc9e446d5f8
    @real-or-random
    real-or-random committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    30fc9d6 View commit details
    Browse the repository at this point in the history

  2. sync-upstream.sh: Add "git show --remerge-diff" tip

    @real-or-random
    real-or-random committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    0a99156 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2023

  1. Merge BlockstreamResearch#244: sync-upstream.sh: Add "git show --reme… 

    …rge-diff" tip

0a99156 sync-upstream.sh: Add "git show --remerge-diff" tip (Tim Ruffing)

Pull request description:

ACKs for top commit:
  jonasnick:
    utACK 0a99156

Tree-SHA512: 6d3a26481f8d8f263db2379aca2670f5610b44fbf6b283550d83af9500b7e156927683d400e720fcb017cade317b176f882159a472ac8d5c99cff886b497dcfb
    @real-or-random
    real-or-random committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    58e27bc View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2023

  1. ci: Always define EXPERIMENTAL variable

    @real-or-random
    real-or-random committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    7e91936 View commit details
    Browse the repository at this point in the history