search

coderifous / jquery-localize

a jQuery plugin that makes it easy to internationalize your web site.
465 stars 142 forks source link

"Contributing" section in README is invalid #36

Closed jgolla closed 10 years ago

jgolla commented 10 years ago

Updated the README.md to reference the CONTRIBUTING.md file. I also changed the packages.json file to remove the modules that are no longer used for the build.

coderifous commented 10 years ago

Ok, thanks! I pulled in your changes, but not via a normal merge. Here's why, in case you're curious:

  1. The first commit ("Resync") was extraneous - just a side effect of git's learning curve.
  2. The third commit was a minor fix to the second commit. (The perfect use case for git commit --amend).

So I cherry-picked the second commit, and "squashed" the third commit into it. This is totally unnecessary, but I'm particular when it comes to my git repo history, and once you get the hang of git, it's actually easy to do.

jgolla commented 10 years ago

Thanks for the lesson!

On February 20, 2014 at 5:24 PM Jim Garvin notifications@github.com wrote:

Ok, thanks! I pulled in your changes, but not via a normal merge. Here's why, in case you're curious:

1. The first commit ("Resync") was extraneous - just a side effect of

git's learning curve.

  1. The third commit was a minor fix to the second commit. (The perfect use case for git commit --amend http://nathanhoad.net/git-amend-your-last-commit ).

    So I cherry-picked http://gitready.com/intermediate/2009/03/04/pick-out-individual-commits.html the second commit, and "squashed" the third commit into it. This is totally unnecessary, but I'm particular when it comes to my git repo history, and once you get the hang of git, it's actually easy to do.

    — Reply to this email directly or view it on GitHub https://github.com/coderifous/jquery-localize/pull/36#issuecomment-35676840 .