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

Add "merge-history" subcommand to codemod #2363

Merged
merged 2 commits into from
Mar 12, 2025
Merged

Add "merge-history" subcommand to codemod #2363

merged 2 commits into from
Mar 12, 2025

Conversation

ef4
Copy link
Contributor

@ef4 ef4 commented Mar 11, 2025

Based on ideas from both @void-mAlex's #2361 and @davidtaylorhq's https://gist.github.com/davidtaylorhq/484505beccd5eeac1166bd75002b3e5a

This one does all the work in a git subtree worktree, so it doesn't actually touch your checked out code at all. The only visible change should be the creation of its outputBranch.

@ef4 ef4 added the enhancement New feature or request label Mar 11, 2025
@davidtaylorhq
Copy link

This works great, thanks @ef4! Love the git subtree technique.

I ran it on this sizable Discourse PR and everything worked. The only tiny nitpick would be that it took more than 30s, so some kind of simple progress output would be nice to have.

@ef4 ef4 merged commit 2f78538 into main Mar 12, 2025
210 checks passed
@ef4 ef4 deleted the codemod-merge-history branch March 12, 2025 15:00
@github-actions github-actions bot mentioned this pull request Mar 12, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants