dshafik / securepasswords.info

A polyglot repo of examples for using secure passwords (typically bcrypt)
https://securepasswords.info
Apache License 2.0
38 stars 13 forks source link

fixes composer require for password_compat #24

Closed zghosts closed 9 years ago

dshafik commented 9 years ago

@zghosts sorry I missed this! Do you mind squashing these commits together?

If you've not done this before, it's quite easy!

$ git rebase -i 47c8533^ # rebase interactive (-i) from the commit before (^) your changes

This will bring up your editor (the same one you write commit messages in) with the list of commits being rebased.

Change the word pick for the second commit (the second line) to fixup or just fand save/exit the file. This will re-do the commits, squashing them together with the commit message from the first only (changing to s or squash will do the same, but rather than ignore the commit message, it will open up your commit editor to edit the new message).

Then you'll need to force push:

$ git push origin -f

This will update the PR, and I'd be happy to merge it, thanks!

zghosts commented 9 years ago

Thanks for the tutorial ;)

I've squashed the commits together, it should be ready for merging.

dshafik commented 9 years ago

@zghosts thanks!