Merge branch 'js/branch-config'

* js/branch-config:
git-branch: rename config vars branch.<branch>.*, too
add a function to rename sections in the config

diff --cc cache.h
Simple merge