search

CERNStudyGroup / cernstudygroup.github.io

https://cernstudygroup.github.io
Other
20 stars 9 forks source link

Update readme #17

Closed RaoOfPhysics closed 8 years ago

RaoOfPhysics commented 8 years ago

If someone knows how to squash commits or cherrypick them, please go ahead and grab just the second of these commits to merge.

Pinging @ibab, @adavidzh, @betatim.

betatim commented 8 years ago

To squash commits try git rebase -i HEAD~3 which should show you the last three commits on your branch. It will open an editor where you can modify the commit message, squash, or even remove commits.

What happened that you needed to do a merge? To keep the history of the repository nice it is good practice to try and avoid having merge commits, usually the fix is to rebase instead.

Improving git-foo one message at a time kung fu :panda_face:

RaoOfPhysics commented 8 years ago

@betatim: Sorry, I had many fails with that attempt, and while I need to learn git I didn't have the time to fiddle too much. Started from scratch and made a new PR instead: #18