Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
  • 1 commit
  • 1 file changed
  • 0 commit comments
  • 1 contributor
Commits on Jun 29, 2012
@balupton balupton Added sync to makefile baee2bf
Showing with 22 additions and 1 deletion.
  1. +22 −1 Makefile
View
23 Makefile
@@ -10,4 +10,25 @@ clean:
rm -Rf node_modules/ npm-debug.log plugins/*/test/out plugins/*/node_modules plugins/*/npm-debug.log plugins/*/test/node_modules plugins/*/test/npm-debug.log
make install
-.PHONY: test install clean
+sync:
+ git checkout docpad-6.x
+ git pull origin docpad-6.x
+ git merge master
+ git push
+
+ git checkout master
+ git pull origin master
+ git merge docpad-6.x
+ git push
+
+ git checkout docpad-6.x
+ git pull origin docpad-6.x
+ git merge master
+ git push
+
+ git checkout dev
+ git pull origin dev
+ git merge master
+ git push
+
+.PHONY: test install clean sync

No commit comments for this range

Something went wrong with that request. Please try again.