zeuxisoo/git --no-ff settings.txt

Created April 15, 2011 05:06

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

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

Download ZIP

How do I make git merge's default be --no-ff --no-commit?

Raw

git --no-ff settings.txt

	git config --global user.name "Your Name"
	git config --global core.mergeoptions "--no-ff"

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