Can TortoiseMerge be used as a difftool with Windows Git Bash?

后端 未结 6 1172
一整个雨季
一整个雨季 2021-01-30 20:37

I\'m just starting to work with Git. I would like to use TortoiseMerge as the difftool and mergetool.

In my $HOME/.gitconfig I have the following sections.

6条回答
  •  离开以前
    2021-01-30 20:49

    When rebasing, I strongly recommend switch $theirs and $mine, because it is different when you merge and rebase-merge. Check here:

    What is the precise meaning of "ours" and "theirs" in git?

    So, if you only use mergetool to rebase like me, do:

    [mergetool "tortoisemerge"]
    cmd = \""c:/Program Files/TortoiseGIT/bin/TortoiseGitMerge.exe"\" -base "$BASE" -theirs "$LOCAL" -mine "$REMOTE" -merged "$MERGED"
    

提交回复
热议问题