Git Diff with Beyond Compare

by

I don’t use extra wrapper .sh files. My environment is Windows XP, git 1.7.1 on cygwin, and Beyond Compare 3. Following is my .git/config file.

[diff]
    tool = bc3
[difftool]
    prompt = false
[difftool "bc3"]
    #use cygpath to transform cygwin path $LOCAL (something like /tmp/U5VvP1_abc) to windows path, because bc3 is a windows software
    cmd = \"c:/program files/beyond compare 3/bcomp.exe\" "$(cygpath -w $LOCAL)" "$REMOTE"
[merge]
    tool = bc3
[mergetool]
    prompt = false
[mergetool "bc3"]
    #trustExitCode = true
    cmd = \"c:/program files/beyond compare 3/bcomp.exe\" "$LOCAL" "$REMOTE" "$BASE" "$MERGED"

Then, I use $ git difftool to compare and $ git mergetool to merge.

About trustExitCode:
For a custom merge command, specify whether the exit code of the merge command can be used to determine whether the merge was successful. If this is not set to true then the merge target file timestamp is checked and the merge assumed to have been successful if the file has been updated, otherwise the user is prompted to indicate the success of the merge.

More Related Contents:

  1. What’s the difference between HEAD^ and HEAD~ in Git?
  2. How to grep Git commit diffs or contents for a certain word
  3. What does FETCH_HEAD in Git mean?
  4. Permission denied (publickey) when deploying heroku code. fatal: The remote end hung up unexpectedly
  5. Can I get a list of files marked –assume-unchanged?
  6. How to checkout in Git by date?
  7. Git: How to ignore fast forward and revert origin [branch] to earlier commit?
  8. Difference between Git and GitHub
  9. Using conditional configuration files with Git
  10. How to fix committing to the wrong Git branch?
  11. List files in local git repo?
  12. What is the Sign Off feature in Git for?
  13. How to make Git pull use rebase by default for all my repositories?
  14. Git push rejected “non-fast-forward”
  15. git merge: Removing files I want to keep!
  16. How do I delete unpushed git commits?
  17. Git: Create a branch from unstaged/uncommitted changes on master
  18. How do you take a git diff file, and apply it to a local branch that is a copy of the same repository?
  19. Find unmerged Git branches?
  20. Git submodule on remote bare
  21. Git commit that doesn’t override original authors in git blame
  22. How to deal with Git “Could not read” error
  23. How do I view a git repo’s receive history?
  24. Get back the changes after accidental checkout?
  25. Rebase feature branch onto another feature branch
  26. How to keep different content of one file in my local and github repository?
  27. What is difference between ‘git reset –hard HEAD~1’ and ‘git reset –soft HEAD~1’?
  28. How can I mark a committed file as read-only in Git?
  29. Checkout Jenkins Pipeline Git SCM with credentials?
  30. npm install package from github repo subfolder

Leave a Comment