Update assets to jQuery-File-Upload v9.12.5 #89
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 usesquash
, usedfixup
) , and thenescape
to get back the command line. and type:wq
to write and quit the editorgit push origin master --force
You will need to cancel your previous pull request and create a new one.