View differences of branches with meld?

后端 未结 8 715
终归单人心
终归单人心 2020-11-30 16:30

I know that I can view the difference between HEAD and current state with meld .. But how can I view the differences between branches, for example master<

8条回答
  •  野趣味
    野趣味 (楼主)
    2020-11-30 16:57

    For Meld on macOS, add this to your ~/.gitconfig as recommended by the maintainer of the macOS application, yousseb:

    [diff]
      tool = meld
    [difftool]
      prompt = false
    [difftool "meld"]
      trustExitCode = true
      cmd = open -W -a Meld --args \"$LOCAL\" \"$REMOTE\"
    [merge]
      tool = meld
    [mergetool]
      prompt = false
    [mergetool "meld"]
      trustExitCode = true
      cmd = open -W -a Meld --args --auto-merge \"$LOCAL\" \"$BASE\" \"$REMOTE\" --output=\"$MERGED\"
    

    You can omit the merge configs if you would like.

    @GutenYe's answer didn't work out for me due to automatic escaping and/or something with zsh.

提交回复
热议问题