cwsaylor · November 7, 2012 19:17
diff --git a/syncm.sh b/syncm.sh
 #!/bin/sh -x
 CURRENT=`git branch | grep "*" | awk '{print $2}'`
 git checkout master
 git fetch
 git merge origin/master
 git checkout ${CURRENT}
 git merge master ${CURRENT}
	#!/bin/sh -x
	CURRENT=`git branch \| grep "*" \| awk '{print $2}'`
	git checkout master
	git fetch
	git merge origin/master
	git checkout ${CURRENT}
	git merge master ${CURRENT}