Skip to content

Instantly share code, notes, and snippets.

@qinshulei

qinshulei/git_merge_config.bash

Created January 21, 2016 02:51
Show Gist options
  • Save qinshulei/b66533c595e5917f1227 to your computer and use it in GitHub Desktop.
Save qinshulei/b66533c595e5917f1227 to your computer and use it in GitHub Desktop.
Download ZIP
merge setting
Raw
git_merge_config.bash
# 3-way merge
git config --global merge.conflictstyle diff3
# patience diff
git config --global diff.algorithm histogram
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment