Merge pull request #142 from PacificBiosciences/develop

Update
PacificBiosciences · May 17, 2017 · b22b63d · b22b63d
2 parents de85900 + f9acaf9
commit b22b63d
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,30 +1,40 @@
 [submodule "pypeFLOW"]
 	path = pypeFLOW
 	url = ../pypeFLOW.git
+	branch = develop
 [submodule "DALIGNER"]
 	path = DALIGNER
 	url = ../DALIGNER.git
+	branch = develop
 [submodule "DAMASKER"]
 	path = DAMASKER
 	url = ../DAMASKER
+	branch = develop
 [submodule "DAZZ_DB"]
 	path = DAZZ_DB
 	url = ../DAZZ_DB.git
+	branch = develop
 [submodule "DEXTRACTOR"]
 	path = DEXTRACTOR
 	url = ../DEXTRACTOR
+	branch = develop
 [submodule "FALCON"]
 	path = FALCON
 	url = ../FALCON.git
+	branch = develop
 [submodule "FALCON_unzip"]
 	path = FALCON_unzip
 	url = git://github.com/PacificBiosciences/FALCON_unzip
+	branch = master
 [submodule "FALCON-make"]
 	path = FALCON-make
 	url = git://github.com/pb-cdunn/FALCON-make.git
+	branch = master
 [submodule "FALCON-examples"]
 	path = FALCON-examples
 	url = git://github.com/pb-cdunn/FALCON-examples.git
+	branch = master
 [submodule "git-sym"]
 	path = git-sym
 	url = git://github.com/cdunn2001/git-sym.git
+	branch = master
diff --git a/DAZZ_DB b/DAZZ_DB
diff --git a/FALCON b/FALCON
diff --git a/FALCON-examples b/FALCON-examples
diff --git a/FALCON-make b/FALCON-make
diff --git a/makefile b/makefile
@@ -21,4 +21,9 @@ install:
 test:
 	${MAKE} -C ./FALCON-make/ $@
 
+update: # for creating new releases
+	git submodule update --remote
+	git add .
+	log-compares # my own tool
+
 .PHONY: init test
diff --git a/pypeFLOW b/pypeFLOW