Merge branch 'sb/committer'

* sb/committer:
  commit: Show committer if automatic
  commit: Show author if different from committer
  Preparation to call determine_author_info from prepare_to_commit

1 files changed, 1 insertions, 0 deletions

diff --git a/cache.h b/cache.h
index 9cee9a5f3..093f04cec 100644
--- a/cache.h
+++ b/cache.h
@@ -735,6 +735,7 @@ extern int config_error_nonbool(const char *);
 #define MAX_GITNAME (1000)
 extern char git_default_email[MAX_GITNAME];
 extern char git_default_name[MAX_GITNAME];
+extern int user_ident_explicitly_given;
 
 extern const char *git_commit_encoding;
 extern const char *git_log_output_encoding;