search

szpone / roguelike

0 stars 0 forks source link

Re-writing Git history #5

Open daniel-j-h opened 7 years ago

daniel-j-h commented 7 years ago

Look into re-writing git history / squashing commits:

https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html

the idea is to "clean up" your branch before you merge into master. Give it a try on your Travis branch and then merge it into master.

szpone commented 7 years ago

I think I made it (and additionally I learned how to change default editor for git messages, I'm not a huge fan of vi)

daniel-j-h commented 7 years ago

Hm still seeing 19 commits here https://github.com/szpone/roguelike/pull/4/commits - did you push after squashing commits?