aboutsummaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-02-15 01:44:15 -0800
committerJunio C Hamano <gitster@pobox.com>2009-02-15 01:44:15 -0800
commit160d2bc35382fb23beb99457e9111d15554bf223 (patch)
treeec3722d8676e73f69c0ab172cf44a06c7aac5fc6 /cache.h
parent2a8644c7f163e4b76a36739ba936f8d5d91c3cf4 (diff)
parent7d48e9e6f77d336376c1a554eeff0590f77e1ee1 (diff)
downloadgit-160d2bc35382fb23beb99457e9111d15554bf223.tar.gz
git-160d2bc35382fb23beb99457e9111d15554bf223.tar.xz
Merge branch 'ms/mailmap'
* ms/mailmap: Move mailmap documentation into separate file Change current mailmap usage to do matching on both name and email of author/committer. Add map_user() and clear_mailmap() to mailmap Add find_insert_index, insert_at_index and clear_func functions to string_list Add mailmap.file as configurational option for mailmap location
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index a7f435dde..37dfb1c18 100644
--- a/cache.h
+++ b/cache.h
@@ -868,6 +868,7 @@ extern int user_ident_explicitly_given;
extern const char *git_commit_encoding;
extern const char *git_log_output_encoding;
+extern const char *git_mailmap_file;
/* IO helper functions */
extern void maybe_flush_or_die(FILE *, const char *);