Skip to content

Instantly share code, notes, and snippets.

@lihaoml
Last active September 13, 2018 15:12
Show Gist options
  • Save lihaoml/e4e4b2ed53c60112898177f88f470248 to your computer and use it in GitHub Desktop.
Save lihaoml/e4e4b2ed53c60112898177f88f470248 to your computer and use it in GitHub Desktop.
Avoid auto editing at 'git pull'

export GIT_MERGE_AUTOEDIT=no

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