I use and like git, but I feel like I'm working against it sometimes. I much prefer a rebase workflow with a linear history, and a chance to reorganize and reword commits so they make more sense. Git allows this workflow, and does quite a good job of it, but I feel nudged towards "just merge it".

If a VCS could do anything to improve the rebase workflow, that would be pretty interesting to me.