From: Junio C Hamano <junkio@cox.net>
Date: Mon, 18 Dec 2006 02:27:17 +0000 (-0800)
Subject: Merge branch 'js/branch-config'
X-Git-Tag: v1.5.0-rc0~81
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bdf17a02fd3224c5308c6451a6965476626f0578?ds=inline;hp=-c

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
---

bdf17a02fd3224c5308c6451a6965476626f0578
diff --combined cache.h
index b540292d66,bfab4f9752..8ad5920d2b
--- a/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)