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

Add force support to 'qmk git-submodule' #19705

Merged
merged 1 commit into from
Mar 27, 2023
Merged

Add force support to 'qmk git-submodule' #19705

merged 1 commit into from
Mar 27, 2023

Conversation

zvecr
Copy link
Member

@zvecr zvecr commented Jan 28, 2023 •
edited
Loading

Description

qmk git-submodule -f will remove any unknown directory within lib/, for instance when swapping from a riot based branch back to develop.

Can be the default behaviour with: qmk config git_submodule.force=True.

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@github-actions github-actions bot added cli qmk cli command python labels Jan 28, 2023
@zvecr zvecr marked this pull request as ready for review January 30, 2023 20:47
@drashna drashna requested a review from a team March 11, 2023 02:27
@zvecr zvecr merged commit e35bb8e into qmk:develop Mar 27, 2023
nicsuzor pushed a commit to nicsuzor/qmk_firmware that referenced this pull request Mar 28, 2023
@zvecr @nicsuzor
Add force support to 'qmk git-submodule' (qmk#19705)
ae26397
coquizen pushed a commit to coquizen/qmk_firmware that referenced this pull request Jun 22, 2023
@zvecr @coquizen
Add force support to 'qmk git-submodule' (qmk#19705)
5ee930e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tzarc tzarc tzarc approved these changes

Assignees
No one assigned
Labels
cli qmk cli command enhancement python
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@zvecr @tzarc