Merge branch 'tojunio' of http://locke.catalyst.net.nz/git/git-martinlanghoff

diff --git a/cache.h b/cache.h
index 9a6bfb96d9d0f4e8316dbbe60469988cf48f197b..99afa2c3c49b56c7c807dd692cb7a83f8f00ade0 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -180,6 +180,7 @@ extern void rollback_index_file(struct cache_file *);
 
 extern int trust_executable_bit;
 extern int only_use_symrefs;
+extern int diff_rename_limit_default;
 
 #define MTIME_CHANGED  0x0001
 #define CTIME_CHANGED  0x0002
@@ -258,6 +259,7 @@ extern void *read_object_with_reference(const unsigned char *sha1,
 const char *show_date(unsigned long time, int timezone);
 int parse_date(const char *date, char *buf, int bufsize);
 void datestamp(char *buf, int bufsize);
+unsigned long approxidate(const char *);
 
 extern int setup_ident(void);
 extern char *get_ident(const char *name, const char *email, const char *date_str);