diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-03-20 11:29:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-20 11:29:19 -0700 |
| commit | 96203bb074544a37fcff9c3f2a68582b76caa263 (patch) | |
| tree | c94d11799e9665230fc1bdf462fc6142590ce948 /Makefile | |
| parent | Fix a spelling mistake in a git-p4 console message (diff) | |
| parent | Update draft release notes to 1.7.0.3 (diff) | |
| download | tgif-96203bb074544a37fcff9c3f2a68582b76caa263.tar.xz | |
Merge branch 'maint'
* maint:
Update draft release notes to 1.7.0.3
fetch: Fix minor memory leak
fetch: Future-proof initialization of a refspec on stack
fetch: Check for a "^{}" suffix with suffixcmp()
daemon: parse_host_and_port SIGSEGV if port is specified
Makefile: Fix CDPATH problem
pull: replace unnecessary sed invocation
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -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 |