News for hackers. Stuff that matters.
Re:GitFlow considered harmful by kiallmacinnes on Friday June 19, 2015 @06:24PM (#9748039)
Agreed, most people hear "rewrite history" and immediately assume "public history".

Rebase is a part of code review. If someone spots a typo and a "fix typo" commit follows it up as happens for a good proportion of GitHub model projects, I cringe. This information is uttery useless to the projects history, and should be rebased as a fixup. Only once code review is done, should a commit be considered for merge. It's at this point that rewriting becomes a problem.

I think most people forgot where Git came from, git is designed from the ground up for this! When someone emails a series of patches to the kernel mailing list for review, they iterate that series of commits over and over until its ready. They don't keep adding new patches on top like the Pull Request model proposed by GitHub/GitLab etc do.

Re:GitFlow considered harmful by ealloc on Friday June 19, 2015 @07:36PM (#9748309)
In my Github experience, rebasing/tidying your commits is expected before a Pull Request is merged, just like your description of Linux development. Eg, the numpy/scipy/matplotlib projects.
Re:GitFlow considered harmful by z1mm32m4n on Saturday June 20, 2015 @01:05AM (#9749061)
Unfortunately, this is not true for many repositories. GitHub's interface (i.e., the "Merge" button), encourages users to merge from the web interface, where this tidying can't happen.
Re:GitFlow considered harmful by hayd on Friday June 19, 2015 @07:45PM (#9748339)
Then someone else rebases over that commit, there's a conflict and lo! the tests fail. Why? typo. It's fixed in the subsequent commit (which you can't see). Lovely.

There's something to be said for having every commit pass tests/work (or if it doesn't saying explicitly in the commit message), if anyone is ever going to step over this commit.

Re:GitFlow considered harmful by damm on Friday June 19, 2015 @10:10PM (#9748680)
That's a hard one; trying to make a single commit in a pull request helps me but sometimes even then a pull request gets ignored and they want me to rebase it.

The problem is they ask /me/ to rebase it; I think they should take a little ownership in the potential rewriting of history.

Re:GitFlow considered harmful by qu4z-2 on Sunday June 21, 2015 @10:00PM (#9755787)
There's no potential rewriting of history before they merge your pull request, only a series of unaccepted draft commits. :)