Viewing all `git diffs` with vimdiff

by 
git config --global diff.tool vimdiff
git config --global difftool.prompt false

Typing git difftool yields the expected behavior.

Navigation commands,

  • :qa in vim cycles to the next file in the changeset without saving anything.

Aliasing (example)

git config --global alias.d difftool

.. will let you type git d to invoke vimdiff.

Advanced use-cases,

  • By default, git calls vimdiff with the -R option. You can override it with git config –global difftool.vimdiff.cmd ‘vimdiff “$LOCAL” “$REMOTE”‘. That will open vimdiff in writeable mode which allows edits while diffing.
  • :wq in vim cycles to the next file in the changeset with changes saved.

More Related Contents:

  1. How can I visualize per-character differences in a unified diff file?
  2. How do you cancel an external git diff?
  3. Highlight changed lines and changed bytes in each changed line
  4. How do I make git use the editor of my choice for commits?
  5. How do I show the changes which have been staged?
  6. How to grep (search) committed code in the Git history
  7. How do I view ‘git diff’ output with my preferred diff tool/ viewer?
  8. What are the differences between double-dot “..” and triple-dot “…” in Git diff commit ranges? [duplicate]
  9. How to compare a local Git branch with its remote branch
  10. How to read the output from git diff?
  11. git-diff to ignore ^M
  12. How do I make git use the editor of my choice for editing commit messages?
  13. How can I get the diff between all the commits that occurred between two dates with Git?
  14. Coloring white space in git-diff’s output
  15. Where does the excerpt in the git diff hunk header come from?
  16. How do you take a git diff file, and apply it to a local branch that is a copy of the same repository?
  17. What does “@@ -1 +1 @@” mean in Git’s diff output?
  18. Git: How can I find a commit that most closely matches a directory?
  19. Git Diff of same files in two directories always result in “renamed”
  20. Make ‘git diff’ ignore ^M
  21. How resolve multiple conflicts with “git mergetool” without having to close the editor between files?
  22. What does the “@@…@@” meta line with at signs in svn diff or git diff mean?
  23. Ignore *all* whitespace changes with git-diff between commits
  24. How can I get a git submodule’s associated commit ID from a past commit in the parent clone?
  25. View differences of branches with meld?
  26. How to apply `git diff` patch without Git installed?
  27. Show both staged & working tree in git diff?
  28. Show git diff, ignoring file permission changes?
  29. How to perform a three-way diff in Git without merging?
  30. GnuTLS recv error (-110): The TLS connection was non-properly terminated

Leave a Comment