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 --combined cache.h
index b540292d669165cf144f3848e54f7494c1d37ad4,bfab4f9752a41970cd46996b0b802c7cfc6108b0..8ad5920d2be9593ad7810e3ccefa1c8b9f4e0750
--- 1/cache.h
--- 2/cache.h
+++ b/cache.h
@@@ -309,7 -309,6 +309,7 @@@ void datestamp(char *buf, int bufsize)
  unsigned long approxidate(const char *);
  
  extern int setup_ident(void);
 +extern void ignore_missing_committer_name();
  extern const char *git_author_info(int);
  extern const char *git_committer_info(int);
  
@@@ -405,6 -404,7 +405,7 @@@ extern int git_config_int(const char *
  extern int git_config_bool(const char *, const char *);
  extern int git_config_set(const char *, const char *);
  extern int git_config_set_multivar(const char *, const char *, const char *, int);
+ extern int git_config_rename_section(const char *, const char *);
  extern int check_repository_format_version(const char *var, const char *value);
  
  #define MAX_GITNAME (1000)