merge: refactor code that calls "git merge-STRATEGY"

[git.git] / Makefile

diff --git a/Makefile b/Makefile
index fc03436617f91614b8ac2c75b3c82ae9240685d4..3a6c6ea5259693db4846b91855675218b1e1a920 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -327,6 +327,12 @@ SCRIPT_SH =
 SCRIPT_LIB =
 TEST_PROGRAMS_NEED_X =
 
+# Having this variable in your environment would break pipelines because
+# you cause "cd" to echo its destination to stdout.  It can also take
+# scripts to unexpected places.  If you like CDPATH, define it for your
+# interactive shell sessions without exporting it.
+unexport CDPATH
+
 SCRIPT_SH += git-am.sh
 SCRIPT_SH += git-bisect.sh
 SCRIPT_SH += git-difftool--helper.sh