zipizap/example.txt

Created September 16, 2015 15:08

Star (0) You must be signed in to star a gist
Fork (0) You must be signed in to fork a gist

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/zipizap/d74e600efda3eabe853d.js"></script>
Save zipizap/d74e600efda3eabe853d to your computer and use it in GitHub Desktop.

Download ZIP

how to enable non-fast-foward by default in ~/.gitconfig

Raw

example.txt

	[merge]
	ff = no
	# same as argument "--no-ff"
	# see http://stackoverflow.com/a/14865661

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment