Skip to content

Instantly share code, notes, and snippets.

@dayer4b
Created March 10, 2015 17:31
Show Gist options
  • Save dayer4b/c8d75df77c7b3b19791f to your computer and use it in GitHub Desktop.
Save dayer4b/c8d75df77c7b3b19791f to your computer and use it in GitHub Desktop.
ensure that git flow NEVER fast forwards merges when finishing features
# this file should already exist at ~/.gitconfig, just add this bit to the end:
[gitflow "feature.finish"]
no-ff = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment