How can I get a side-by-side diff when I do “git diff”?

by

Try git difftool

Use git difftool instead of git diff. You’ll never go back.

UPDATE to add an example usage:

Here is a link to another stackoverflow that talks about git difftool: How do I view ‘git diff’ output with my preferred diff tool/ viewer?

For newer versions of git, the difftool command supports many external diff tools out-of-the-box. For example vimdiff is auto supported and can be opened from the command line by:

cd /path/to/git/repo
git difftool --tool=vimdiff

Other supported external diff tools are listed via git difftool --tool-help here is an example output:

'git difftool --tool=<tool>' may be set to one of the following:
        araxis
        kompare
        vimdiff
        vimdiff2

The following tools are valid, but not currently available:
        bc3
        codecompare
        deltawalker
        diffuse
        ecmerge
        emerge
        gvimdiff
        gvimdiff2
        kdiff3
        meld
        opendiff
        tkdiff
        xxdiff

More Related Contents:

  1. How can I see the differences between two branches?
  2. How do I show the changes which have been staged?
  3. How to list only the names of files that changed between two commits
  4. Viewing unpushed Git commits
  5. How can I see the changes in a Git commit?
  6. How to compare files from two different branches
  7. What are the differences between double-dot “..” and triple-dot “…” in Git commit ranges?
  8. What are the differences between double-dot “..” and triple-dot “…” in Git diff commit ranges? [duplicate]
  9. How to read the output from git diff?
  10. git-diff to ignore ^M
  11. How do I diff the same file between two different commits on the same branch?
  12. ‘git diff’ doesn’t show enough
  13. Export only modified and added files with folder structure in Git
  14. How can I get the diff between all the commits that occurred between two dates with Git?
  15. Trying to understand `git diff` and `git mv` rename detection mechanism
  16. Getting the difference between two repositories
  17. How do you take a git diff file, and apply it to a local branch that is a copy of the same repository?
  18. Show diff between commits
  19. How to “git show” the diffs for a merge commit?
  20. Using Git diff to detect code movement + How to use diff options
  21. Make ‘git diff’ ignore ^M
  22. Making git diff –stat show full file path
  23. Ignore *all* whitespace changes with git-diff between commits
  24. How to diff a commit with its parent
  25. Exclude file from “git diff”
  26. What are the differences between these git diff commands?
  27. How to get Git diff of the first commit?
  28. Show git diff, ignoring file permission changes?
  29. Using git diff, how can I get added and modified lines numbers?
  30. How to make ‘git diff’ ignore comments

Leave a Comment