Add -y/--no-prompt option to mergetool

diff --git a/environment.c b/environment.c
index 9ebf485a738740fe6ad0ebaa5c5bf4695ee527ef..bb96ac0a71bc5614cd3352902586ff0a70a4eece 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -80,6 +80,11 @@ int is_bare_repository(void)
        return is_bare_repository_cfg && !get_git_work_tree();
 }
 
+int have_git_dir(void)
+{
+       return !!git_dir;
+}
+
 const char *get_git_dir(void)
 {
        if (!git_dir)