Merge branch 'mm/config-edit-global'

diff --git a/cache.h b/cache.h
index 30268b6eed673dbec81bb3037bf3a0fe7679c52e..76be7850878674c111a3064c9f513d1b4d5edbcd 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1062,6 +1062,7 @@ extern const char *git_author_info(int);
 extern const char *git_committer_info(int);
 extern const char *fmt_ident(const char *name, const char *email, const char *date_str, int);
 extern const char *fmt_name(const char *name, const char *email);
+extern const char *ident_default_name(void);
 extern const char *ident_default_email(void);
 extern const char *git_editor(void);
 extern const char *git_pager(int stdout_is_tty);