From: Junio C Hamano <junkio@cox.net>
Date: Sat, 10 Jun 2006 21:09:49 +0000 (-0700)
Subject: Merge branch 'js/config' into pu
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=refs%2Fheads%2Fpu;hp=-c;p=git.git

Merge branch 'js/config' into pu

* js/config:
  repo-config: learn the flag "--no-local"
  Read configuration also from ~/.gitconfig
---

c7d30f8e865ad728f1b7bc487bbbdd3a49537653
diff --combined cache.h
index 1b8e053f,14fe5c86..faad6a39
--- a/cache.h
+++ b/cache.h
@@@ -208,12 -208,6 +208,12 @@@ extern const unsigned char null_sha1[20
  
  int git_mkstemp(char *path, size_t n, const char *template);
  
 +enum sharedrepo {
 +	PERM_UMASK = 0,
 +	PERM_GROUP,
 +	PERM_EVERYBODY
 +};
 +int git_config_perm(const char *var, const char *value);
  int adjust_shared_perm(const char *path);
  int safe_create_leading_directories(char *path);
  char *safe_strncpy(char *, const char *, size_t);
@@@ -354,6 -348,7 +354,7 @@@ extern void packed_object_info_detail(s
  /* Dumb servers support */
  extern int update_server_info(int);
  
+ extern int git_ignore_local_config;
  typedef int (*config_fn_t)(const char *, const char *);
  extern int git_default_config(const char *, const char *);
  extern int git_config_from_file(config_fn_t fn, const char *);