Permalink
Browse files

Added merge-lang task

  • Loading branch information...
1 parent ea41ec2 commit 4ca52ab636e7060cbb57fe2b07ef8a47d772102f @fd committed Mar 2, 2013
Showing with 7 additions and 0 deletions.
  1. +7 −0 Makefile
View
@@ -12,3 +12,10 @@ build_sx:
test:
go get 'github.com/simonz05/godis/redis'
go test ${SX}
+
+merge-lang:
+ git merge --no-commit --no-edit --no-ff sx-lang-master
+ git show master:Makefile > Makefile
+ git show master:LICENCE.md > LICENCE.md
+ git add Makefile LICENCE.md
+ git commit -m "Merged sx-lang-master into master"

0 comments on commit 4ca52ab

Please sign in to comment.