diff options
author | Junio C Hamano <junkio@cox.net> | 2006-07-09 23:37:19 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-07-09 23:37:19 -0700 |
commit | e6ff54a261d72dd43c0755bae09a4970ec2620a1 (patch) | |
tree | b32dd6241df599d4b37713e2e97ee705fb3563fc /Makefile | |
parent | ff4c848527137b5ca52dfe97c25fcc8bcc4b8726 (diff) | |
parent | cb652963486a89eeac926d407c2893dbdbdcf66b (diff) | |
download | git-e6ff54a261d72dd43c0755bae09a4970ec2620a1.tar.gz |
Merge branch 'ew/svn'
* ew/svn:
Fix some doubled word typos
Typofix in Makefile comment.
Makefile: export NO_SVN_TESTS
git-svn: migrate out of contrib (follow-up)
git-svn: migrate out of contrib
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -33,6 +33,10 @@ all: # Define NO_SYMLINK_HEAD if you never want .git/HEAD to be a symbolic link. # Enable it on Windows. By default, symrefs are still used. # +# Define NO_SVN_TESTS if you want to skip time-consuming SVN interoperability +# tests. These tests take up a significant amount of the total test time +# but are not needed unless you plan to talk to SVN repos. +# # Define PPC_SHA1 environment variable when running make to make use of # a bundled SHA1 routine optimized for PowerPC. # @@ -134,7 +138,7 @@ SCRIPT_PERL = \ git-shortlog.perl git-rerere.perl \ git-annotate.perl git-cvsserver.perl \ git-svnimport.perl git-mv.perl git-cvsexportcommit.perl \ - git-send-email.perl + git-send-email.perl git-svn.perl SCRIPT_PYTHON = \ git-merge-recursive.py @@ -653,6 +657,7 @@ GIT-CFLAGS: .FORCE-GIT-CFLAGS # with that. export NO_PYTHON +export NO_SVN_TESTS test: all $(MAKE) -C t/ all |