contrib: add 'git difftool' for launching common merge tools

diff --git a/setup.c b/setup.c
index 833ced2269ae45b08f381fb2644b74f47cf50d1a..6b277b6a11d3d8419d79a93628b9923001a065a6 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -468,7 +468,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
                                *nongit_ok = 1;
                                return NULL;
                        }
-                       die("Not a git repository");
+                       die("Not a git repository (or any of the parent directories): %s", DEFAULT_GIT_DIR_ENVIRONMENT);
                }
                if (chdir(".."))
                        die("Cannot change to %s/..: %s", cwd, strerror(errno));