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

Squash 2.x changes for diff purposes #471

Draft
wants to merge 1 commit into
base: 1.1.x
Choose a base branch
from
Draft

Conversation

frenchy64
Copy link
Collaborator

@frenchy64 frenchy64 commented May 13, 2024

git reset --hard 1.1.x
git checkout master -- src
git add .
git commit -m 'squashed'
git push -f

@frenchy64 frenchy64 force-pushed the squash-2.x-changes branch 6 times, most recently from 985da5d to ce54553 Compare May 14, 2024 22:16
@frenchy64 frenchy64 force-pushed the squash-2.x-changes branch from ce54553 to 1476bde Compare May 31, 2024 15:07
@frenchy64 frenchy64 closed this May 31, 2024
@frenchy64 frenchy64 force-pushed the squash-2.x-changes branch from 1476bde to 8d3c17d Compare May 31, 2024 15:12
@frenchy64 frenchy64 reopened this May 31, 2024
@frenchy64 frenchy64 force-pushed the squash-2.x-changes branch from ca341f4 to afc1a93 Compare June 17, 2024 14:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant