Skip to content

Update assets to jQuery-File-Upload v9.12.5 #89

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

Merged
merged 1 commit into from
Jun 15, 2016
Merged

Conversation

peterwake
Copy link
Contributor

Hi @tors and @felixbuenemann - now I have learned how to squash commits!

For anyone else doing this (assuming you have 3 commits to squash into one, and you had been working on your forked master):
git rebase -i HEAD~3
This will take you into a vim editor - use i to edit (in my case, didn't use squash, used fixup) , and then escape to get back the command line. and type :wq to write and quit the editor
git push origin master --force
You will need to cancel your previous pull request and create a new one.

@tors
Copy link
Owner

tors commented Jun 15, 2016

Looks good! Thanks for the contribution! If there are no issues, I'm gonna go ahead and merge this pull request and push to rubygems. cc @felixbuenemann

@felixbuenemann
Copy link
Collaborator

@tors :shipit:

@tors tors merged commit 3510e6a into tors:master Jun 15, 2016
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.

3 participants