I was checking my feed reader today and noticed that my blog’s feed seems to render incorrectly.

Why does this happen? How do I fix it?

My normal workflow didn’t involve rebase; so, my natural curiosity sparked up and I dove into the documentation.

It turns out git-rebase is quite controversial. (And, you should avoid it if you’re sharing your commits.)

Linus Torvalds on rebasing:

• http://kerneltrap.org/Linux/Git_Management
• http://lwn.net/Articles/291302/
• http://lwn.net/Articles/291303/
• http://lwn.net/Articles/291304/

Random Redditors:

• http://www.reddit.com/r/programming/comments/6ube0/synchronizingdevelopmentrebasevspullmerge_git/?sort=top

Down: Rails

Up: Django and Zend Framework(?!)

Odd: Erlang (Erlang is hot… but I guess not that well known yet?)

For my situation, git blame is seriously awesome.

When someone starts typing their personal email into the code base in some random area and accidentally checks it in, you can figure out exactly who is lazy with focusing their windows.

(I wonder if there’s a way to automatically reject pushes that don’t pass spec tests…)

Todo: check out git bisect

One day, you find yourself happily hacking away at some code you checked out from one of your collaborative coding projects and BAM!, you hit a gnarly bit of one-line wizardry that completely blows your mind. While it may read like English and be as concise as an abridged Cliff Notes, the functionality you need to modify is crystallized somewhere between the continuations and inline DSL definitions.

Who wrote this?

The solution to this would be what I call Code Scent (as opposed to Code Smell). With Code Scent, you’d be able to see code history on a line-by-line or better granularity. Imagine, if you will, selecting a menu option and getting a highlighting scheme that told you who touched which piece of code most recently: