diff --git a/.github/workflows/update_upstream_from_fork.yml b/.github/workflows/update_upstream_from_fork.yml index b2985d1..6476a2c 100644 --- a/.github/workflows/update_upstream_from_fork.yml +++ b/.github/workflows/update_upstream_from_fork.yml @@ -39,8 +39,8 @@ jobs: git config --global user.email "will.hickey@anza.xyz" git config --global user.name "GHA: Update Upstream From Fork" git fetch --all - git show remotes/upstream/master - git show origin/master + git log --oneline remotes/upstream/master + git log --oneline origin/master git checkout -b temp_branch remotes/upstream/master git cherry-pick remotes/upstream/master..origin/master git push upstream master