got gists working in vim (+ sort plugins)
master change 1
change 2 on master
change 3 on master
change 4 on master
cool feature
i'm just working away la di dah...

(no conflicts here!)
cool feature is done!
git rerere enabled... let's see how this works.