search

Luthaf / Jumos.jl

Julia toolbox for molecular simulations
http://jumos.readthedocs.org/en/latest/
Other
23 stars 11 forks source link

[doc] Minor English changes. #4

Closed mcprentiss closed 9 years ago

mcprentiss commented 9 years ago

I read though the docs, found a few problems, and fixed them

Luthaf commented 9 years ago

Thank you for this ! Can you just squash you commits (I can do a PR to your repo for this if you want), and add the [doc] prefix to the commit message ? This allow for a more readable git history.

I'll have to write a Contributing.md file sooner than what I thought !

mcprentiss commented 9 years ago

Happy to help! I will keep my eyes open about other changes. I added the [doc], I am working on the squashing bit. I need to improve some of my more advanced git commands. Mike

On Wed, Dec 17, 2014 at 7:38 AM, Luthaf notifications@github.com wrote:

Thank you for this ! Can you just squash you commits (I can do a PR to your repo for this if you want), and add the [doc] prefix to the commit message ? This allow for a more readable git history.

I'll have to write a Contributing.md file sooner than what I thought !

— Reply to this email directly or view it on GitHub https://github.com/Luthaf/Jumos.jl/pull/4#issuecomment-67322748.

Luthaf commented 9 years ago

You need to use git rebase -i HEAD~3, and replace pick by squash for the two first commit. After that, you can change the commit title by running git commit --amend, and then push to your repo with git push -f. The -f option erase your previous change and replace them by the rebased commits.

Luthaf commented 9 years ago

Ok, I have done it by hand : https://github.com/Luthaf/Jumos.jl/commit/cec0906a038a20f55d2ef37ab3f1a94a072b111b.

You can now run

git remote add upstream https://github.com/Luthaf/Jumos.jl
git pull -f upstream

from the .julia/v0.4/Jumos folder.