[Git] mergetool

 

위치

~/.gitconfig

 

mergetool

 

$ git config --global merge.tool diffmerge
$ git config --global mergetool.diffmerge.cmd "diffmerge–merge–result= \$MERGED \$LOCAL \$BASE \$REMOTE"
$ git config --global mergetool.diffmerge.trustExitCode true

$ git mergetool

 

자동 백업 안되게 (default backup)

$ git config --global mergetool.keepBackup false

 

difftool

$ git config --global diff.tool diffmerge
$ git config --global difftool.diffmerge.cmd "diffmerge \$LOCAL \$REMOTE"

$ git difftool master~1 foo.rb

 

 

$ git config --global merge.tool p4merge
$ git config --global mergetool.p4merge.cmd

 

 

자세한 내용 추후 추가

 

참고

https://www.git-scm.com/docs/git-mergetool

Git - git-mergetool Documentation

https://dogfeet.github.io/articles/2011/git-mergediff.html

#dogfeet - Git:mergetool, difftool