Skip to content

Instantly share code, notes, and snippets.

@JacobWay

JacobWay/git.md

Last active March 26, 2017 03:59
Show Gist options
  • Save JacobWay/819ead91e86a380df614e6061aac8632 to your computer and use it in GitHub Desktop.
Save JacobWay/819ead91e86a380df614e6061aac8632 to your computer and use it in GitHub Desktop.
Download ZIP
about git
Raw
git.md

Git

Git configuration

  • Change your editor git config --global core.editor vim

  • Change your merge tool git config --global merge.tool vimdiff git config --global merge.conflictstyle diff3

Resolve conflict

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