This request seems to have fallen off the radar. I'm using etckeeper, but I would love to have etcgit's support for keeping pristine conffiles in a separate branch, for purposes of merging at upgrade time.