Can I make git recognize a UTF-16 file as text?

by

I’ve been struggling with this problem for a while, and just discovered (for me) a perfect solution:

$ git config --global diff.tool vimdiff      # or merge.tool to get merging too!
$ git difftool commit1 commit2

git difftool takes the same arguments as git diff would, but runs a diff program of your choice instead of the built-in GNU diff. So pick a multibyte-aware diff (in my case, vim in diff mode) and just use git difftool instead of git diff.

Find “difftool” too long to type? No problem:

$ git config --global alias.dt difftool
$ git dt commit1 commit2

Git rocks.

More Related Contents:

  1. How do I show the changes which have been staged?
  2. How can I see the changes in a Git commit?
  3. How do I view ‘git diff’ output with my preferred diff tool/ viewer?
  4. What are the differences between double-dot “..” and triple-dot “…” in Git diff commit ranges? [duplicate]
  5. How to compare a local Git branch with its remote branch
  6. How to read the output from git diff?
  7. git-diff to ignore ^M
  8. What is `git diff –patience` for?
  9. How can I get the diff between all the commits that occurred between two dates with Git?
  10. use Winmerge inside of Git to file diff
  11. In the context of git (and diff), what is a “hunk”
  12. Coloring white space in git-diff’s output
  13. How do you take a git diff file, and apply it to a local branch that is a copy of the same repository?
  14. What does “@@ -1 +1 @@” mean in Git’s diff output?
  15. Git: How can I find a commit that most closely matches a directory?
  16. Git Diff of same files in two directories always result in “renamed”
  17. Make ‘git diff’ ignore ^M
  18. Ignore *all* whitespace changes with git-diff between commits
  19. How can I get a git submodule’s associated commit ID from a past commit in the parent clone?
  20. How can I visualize per-character differences in a unified diff file?
  21. Using git to identify all modified functions in a revision
  22. Exclude file from “git diff”
  23. How to apply `git diff` patch without Git installed?
  24. ‘git status’ shows changed files, but ‘git diff’ doesn’t
  25. Diffing between two entire directories/projects in hg or git?
  26. Show both staged & working tree in git diff?
  27. How to perform a three-way diff in Git without merging?
  28. ‘git log’ output encoding issues in Windows 10 CLI terminal
  29. Using git diff, how can I get added and modified lines numbers?
  30. How to make ‘git diff’ ignore comments

Leave a Comment