Configuring diff tool with .gitconfig

by

An additional way to do that (from the command line):

git config --global diff.tool tkdiff
git config --global merge.tool tkdiff
git config --global --add difftool.prompt false

The first two lines will set the difftool and mergetool to tkdiff– change that according to your preferences. The third line disables the annoying prompt so whenever you hit git difftool it will automatically launch the difftool.

More Related Contents:

  1. How can I selectively merge or pick changes from another branch in Git?
  2. Git: How to solve Permission denied (publickey) error when using Git?
  3. How to undo ‘git reset’?
  4. How to convert a Git shallow clone to a full clone?
  5. git pull while not in a git directory
  6. How to prune local tracking branches that do not exist on remote anymore
  7. How to squash commits in git after they have been pushed?
  8. Link to the issue number on GitHub within a commit message
  9. How to permanently remove few commits from remote branch
  10. What is git tag, How to create tags & How to checkout git remote tag(s)
  11. Git – Ignore files during merge
  12. Commit history on remote repository
  13. Can I use git diff on untracked files?
  14. gitignore all files of extension in directory
  15. Is there a way to trigger a hook after a new branch has been checked out in Git?
  16. Copy a git repo without history
  17. List all the files that ever existed in a Git repository
  18. How to only update specific git submodules?
  19. Finding most changed files in Git
  20. difference between origin/branch_name and branch_name?
  21. Viewing all `git diffs` with vimdiff
  22. How to commit no change and new message?
  23. Git clone without .git directory
  24. Understanding the basics of Git and GitHub [closed]
  25. git clone can’t resolve proxy
  26. How can I rename a git stash?
  27. Where does Git store files?
  28. GitHub pages only showing ReadMe file?
  29. Why do changing adjacent lines but modifying independently cause a git merge conflict?
  30. Git create branch from range of previous commits?

Leave a Comment