News for hackers. Stuff that matters.

A comment on Git Workflow Basics. Parent comment

Re:Git Workflow Basics by tomstuart on Wednesday August 17, 2016 @11:27AM (#12305393)
That’s right. `git merge --squash` doesn’t even make a commit, it just updates the working tree and index to look like the post-merge contents — it’s then up to you to actually commit. So yeah, you don’t even end up with a merge commit.
[ Parent | on HN ]
Re:Git Workflow Basics by steveklabnik on Wednesday August 17, 2016 @11:35AM (#12305456)
Ah ha! TIL. Thank you!

(One thing I really love about git is that it's a tool I use extremely often (it's something like, 20% of the commands I run in my terminal), yet I learn something new and useful all the time.)

[ Parent | on HN ]