Svel · April 3, 2012 02:34
diff --git a/gistfile1.sh b/gistfile1.sh
 # Inspired from https://www.braintreepayments.com/braintrust/our-git-workflow
 # and some https://www.google.com/search?q=git%20workflow&hl=en searching
 #
 git checkout master
 git merge --squash dev
 msg="Version XXX";log=$(git log --format="  * %s" dev ^$(git log --merges -n 1 dev --format="%H")); echo -e "$msg\n\n$log" | git commit -F-
 git checkout dev && git merge master
	# Inspired from https://www.braintreepayments.com/braintrust/our-git-workflow
	# and some https://www.google.com/search?q=git%20workflow&hl=en searching
	#
	git checkout master
	git merge --squash dev
	msg="Version XXX";log=$(git log --format=" * %s" dev ^$(git log --merges -n 1 dev --format="%H")); echo -e "$msg\n\n$log" \| git commit -F-
	git checkout dev && git merge master