News for hackers. Stuff that matters.

A comment on Squash your commits.

Re:Squash your commits by gus_massa on Friday April 01, 2016 @02:52PM (#11407498)
Perhaps I'm greedy, but I'd like also an additional option to rebase without squashing ...

Also, it's not clear if it is possible to disable the merge button completely. I prefer to use the command line to rebase and fix the details in the commits, but the big green "merge" button is always too tempting and it's easy to press it by mistake.

[ Parent | on HN ]
Re:Squash your commits by jakub_g on Friday April 01, 2016 @03:28PM (#11407797)
This is a huge issue for me both with GitHub and Atlassian Stash.

On both you even cannot see when the branch was started, and you can merge fine as long as there were no merge issues. Then you run gitk and it looks like a spaghetti-horror, with trivial branches being started 200 commits ago.

I don't necessarily need a "rebase&merge" button but at least info about the shared ancestor with master.

[ Parent | on HN ]
Re:Squash your commits by codingWithGit on Friday April 01, 2016 @04:08PM (#11408120)
you can always do this in the command line locally.
[ Parent | on HN ]