Enable Git's rerere feature to support long-lived feature branches

[kieranpotts]

[rerere]
    # Remember my merges
    # http://gitfu.wordpress.com/2008/04/20/git-rerere-rereremember-what-you-did-last-time/
    enabled = false

References:

• Fix conflicts only once with git rerere