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 tap and drag to sway-input #2725

Merged
merged 1 commit into from
Sep 30, 2018
Merged

Conversation

PumbaPe
Copy link
Contributor

@PumbaPe PumbaPe commented Sep 28, 2018

Add functionality to disable tap-and-drag to sway-input with drag disable.

@ddevault
Copy link
Contributor

Nice! Can you connect the email you wrote the commits with to GitHub, then squash them together?

@PumbaPe
Copy link
Contributor Author

PumbaPe commented Sep 29, 2018

Not sure what you mean by that... I set the email and tried to resubmit the commits together. Is that what you were asking?

@RyanDwyer
Copy link
Member

To squash the commits, checkout your branch then run git reset HEAD~. This removes the head commit from your branch and makes the changes show as modifications in your working directory. You'll want to do it twice because there's two commits in your branch. Then add your files and commit them like you would normally, and git push --force to overwrite your remote branch with the new one.

@PumbaPe
Copy link
Contributor Author

PumbaPe commented Sep 29, 2018

Ah thanks, I did this the last time, but still didn't manage to commit everything together. Sorry, first time actually using git. Should be one commit now.

@ddevault ddevault merged commit 8f6aca2 into swaywm:master Sep 30, 2018
@ddevault
Copy link
Contributor

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants