Git: configure patterns for difftool and mergetool

前端 未结 1 499
孤城傲影
孤城傲影 2021-02-09 19:17

In Mercurial, one can define a pattern for external diff and merge tools (so that they are called only for files matching the pattern specified):

[diff-patterns]         


        
1条回答
  •  鱼传尺愫
    2021-02-09 19:50

    You would use a merge driver in a gitattributes file.

    See for instance "How do I tell git to always select my local version for conflicted merges on a specific file?"

    *.ext merge=mymergetool
    

    You can use patterns in a gitattributes file.

    0 讨论(0)
提交回复
热议问题