Browse code

update makefile

guangchuang yu authored on 17/08/2017 09:18:45
Showing1 changed files

  • Makefile index 4bd7d78b..ddd2abcd 100644
... ...
@@ -84,7 +84,7 @@ gitmaintain:
84 84
 	git fsck --full
85 85
 
86 86
 
87
-push:
87
+pushX:
88 88
 	git push -u origin master;\
89 89
 	git checkout bioc;\
90 90
 	git pull;\
... ...
@@ -92,3 +92,12 @@ push:
92 92
 	git push upstream master;\
93 93
 	git checkout master
94 94
 
95
+update:
96
+	git fetch --all;\
97
+	git checkout master;\
98
+	git merge upstream/master;\
99
+	git merge origin/master
100
+
101
+push: update
102
+	git push upstream master;\
103
+	git push origin master