Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

diff --git a/environment.c b/environment.c
index 2af12fd68968c5b6ceab645fd0142f4f30a6f87a..b5a6c69f7c1d214daa2556d04dd35e0976fc6e5e 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -33,6 +33,7 @@ size_t delta_base_cache_limit = 16 * 1024 * 1024;
 char *pager_program;
 int pager_in_use;
 int pager_use_color = 1;
+char *editor_program;
 int auto_crlf = 0;     /* 1: both ways, -1: only when adding git objects */
 
 /* This is set by setup_git_dir_gently() and/or git_default_config() */