Squash your commits

#1

Post by WillAbides » Fri, Apr 01, 2016, 6:30 PM UTC

Squash your commits
github.com

Re: Squash your commits

#2

Post by spleeyah » Fri, Apr 01, 2016, 6:44 PM UTC

Unsure if April Fool's joke...

Re: Squash your commits

#3

Post by ianleeclark » Fri, Apr 01, 2016, 6:45 PM UTC

This is a feature I've wanted for such a long time. While it's perfectly feasible to do through the command line, I've always found myself having to force push to update the history on github's side of things.

I typically did it through git rebase -i HEAD~N, so maybe someone here on HN knows of a better way to squash a commit whenever you're updating remote history. Albeit, it seems that updating remote history with a squashed commit isn't entirely attractive behavior and that's why I was forced to force push.

Re: Squash your commits

#4

Post by ianleeclark » Fri, Apr 01, 2016, 6:45 PM UTC

spleeyah wrote: post #2

Unsure if April Fool's joke...

I'd cry.

Re: Squash your commits

#5

Post by cthulhujr » Fri, Apr 01, 2016, 6:46 PM UTC

I could see this replacing the git workflow of creating a temporary branch that's used just for merging pre-master.

Re: Squash your commits

#6

Post by joshmanders » Fri, Apr 01, 2016, 6:48 PM UTC

spleeyah wrote: post #2

Unsure if April Fool's joke...

Would be the worst April Fools joke ever. Even above "drop mic" by Google.

Re: Squash your commits

#7

Post by moby » Fri, Apr 01, 2016, 6:48 PM UTC

ianleeclark wrote: post #4

spleeyah wrote: post #2

Unsure if April Fool's joke...

I'd cry.

Not a joke. Squash away. :)

Re: Squash your commits

#8

Post by mchahn » Fri, Apr 01, 2016, 6:49 PM UTC

spleeyah wrote: post #2

Unsure if April Fool's joke...

It would be the most boring April Fools joke of the day. As a real thing I find it quite useful.

Re: Squash your commits

#9

Post by gjtorikian » Fri, Apr 01, 2016, 6:50 PM UTC

I mentioned this in a tweet[0] but we have a quasi-tradition of shipping on April 1st:

* https://github.com/blog/1815-l-is-for-labels

* https://github.com/blog/1451-branch-and-tag-labels-for-commi...

* https://github.com/blog/626-announcing-svn-support

[0]: https://twitter.com/gjtorikian/status/715972348860633088

Re: Squash your commits

#10

Post by cballard » Fri, Apr 01, 2016, 6:50 PM UTC

This is a bad idea masquerading as a good idea. Before making a pull request (or doing any sort of merge), you should rebase against upstream master (or whatever you're going to push to). However, keeping distinct atomic commits that change one and only one small thing, when possible, is much preferable if bisect or blame is used. If you have broken or poorly written commits, use fixup, reword, squash, etc. in rebase -i.

Using fast-forward (and possibly only allowing fast-forward) is a good idea. Squashing entire pull requests that may change multiple things into a single commit is a very bad idea.