Posts Tagged ‘branches’

Note to self: comparing two branches in git and squashing several commits into one

Posted by Rahoul Baruah on June 2nd, 2009 under General, Managing Successful Projects, Ruby on Rails and Software Development Tags: , , ,  •  3 Comments

I always forget how to do this so I’m writing it down (especially as it’s really easy and git, as usual, makes me feel stupid as Linus is so much smarter than me).
Suppose you’ve been working in branch X and you’re about to merge those changes into branch Y …

work in branch X [...]